From db675daa2abaa3e3a721a604c110f2b50e92302c Mon Sep 17 00:00:00 2001
From: Wei Huang <Wei.Huang@noaa.gov>
Date: Wed, 14 Aug 2024 00:38:57 +0000
Subject: [PATCH] working azure atm forecast only

---
 env/AZUREPW.env                        | 4 ++++
 parm/config/gfs/config.base            | 4 ++--
 parm/config/gfs/config.resources.AWSPW | 1 +
 workflow/rocoto/rocoto.py              | 3 ++-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/env/AZUREPW.env b/env/AZUREPW.env
index 7b86a96375..39fc78c524 100755
--- a/env/AZUREPW.env
+++ b/env/AZUREPW.env
@@ -35,6 +35,10 @@ fi
 
 if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
+    export I_MPI_FABRICS=shm:ofi
+    export I_MPI_OFI_PROVIDER=tcp
+   #export I_MPI_DEBUG=6
+
     export launcher="srun --mpi=pmi2 -l"
 
     (( nnodes = (ntasks+tasks_per_node-1)/tasks_per_node ))
diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
index 2f21c9a106..2bcc262704 100644
--- a/parm/config/gfs/config.base
+++ b/parm/config/gfs/config.base
@@ -483,8 +483,8 @@ export OFFSET_START_HOUR=0
 # Number of regional collectives to create soundings for
 export NUM_SND_COLLECTIVES=${NUM_SND_COLLECTIVES:-9}
 
-# The tracker, genesis, and METplus jobs are not supported on AWS yet
-# TODO: we should place these in workflow/hosts/awspw.yaml as part of AWS setup, not for general.
+# The tracker, genesis, and METplus jobs are not supported on CSPs yet
+# TODO: we should place these in workflow/hosts/awspw.yaml as part of AWS/AZURE setup, not for general.
 if [[ "${machine}" == "AWSPW" || "${machine}" == "AZUREPW" ]]; then
    export DO_TRACKER="NO"
    export DO_GENESIS="NO"
diff --git a/parm/config/gfs/config.resources.AWSPW b/parm/config/gfs/config.resources.AWSPW
index 8649713bb7..2bb5f35e76 100644
--- a/parm/config/gfs/config.resources.AWSPW
+++ b/parm/config/gfs/config.resources.AWSPW
@@ -3,6 +3,7 @@
 # AWS-specific job resources
 
 export is_exclusive="True"
+export memory=None
 
 # shellcheck disable=SC2312
 for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
diff --git a/workflow/rocoto/rocoto.py b/workflow/rocoto/rocoto.py
index 2a20820da8..a9b443aeda 100644
--- a/workflow/rocoto/rocoto.py
+++ b/workflow/rocoto/rocoto.py
@@ -146,7 +146,8 @@ def _create_innermost_task(task_dict: Dict[str, Any]) -> List[str]:
     strings.append(f'\t<walltime>{walltime}</walltime>\n')
     strings.append(f'\t<nodes>{nodes}:ppn={ppn}:tpp={threads}</nodes>\n')
     if memory is not None:
-        strings.append(f'\t<memory>{memory}</memory>\n')
+        if memory != 'None':
+            strings.append(f'\t<memory>{memory}</memory>\n')
     if native is not None:
         strings.append(f'\t<native>{native}</native>\n')
     strings.append('\n')