Merge branch 'develop' into wavegrid_compath

NOAA-EMC · Dec 24, 2024 · 0cbcec6 · 0cbcec6
2 parents f7a7dda + 290f1d2
commit 0cbcec6
Show file tree

Hide file tree

Showing 19 changed files with 161 additions and 84 deletions.
diff --git a/env/AWSPW.env b/env/AWSPW.env
@@ -33,7 +33,29 @@ else
     exit 2
 fi
 
-if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
+if [[ "${step}" = "prep" ]] || [[ "${step}" = "prepbufr" ]]; then
+
+    export POE="NO"
+    export BACK="NO"
+    export sys_tp="AWSPW"
+    export launcher_PREP="srun"
+
+elif [[ "${step}" = "prepsnowobs" ]]; then
+
+    export APRUN_CALCFIMS="${APRUN_default}"
+
+elif [[ "${step}" = "prep_emissions" ]]; then
+
+    export APRUN="${APRUN_default}"
+
+elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
+
+    export CFP_MP="YES"
+    if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
+    export wavempexec=${launcher}
+    export wave_mpmd=${mpmd_opt}
+
+elif [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
     export launcher="srun --mpi=pmi2 -l"
 
@@ -52,52 +74,16 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
 
 elif [[ "${step}" = "post" ]]; then
 
-    export NTHREADS_NP=${NTHREADS1}
-    export APRUN_NP="${APRUN_default}"
-
-    export NTHREADS_DWN=${threads_per_task_dwn:-1}
-    [[ ${NTHREADS_DWN} -gt ${max_threads_per_task} ]] && export NTHREADS_DWN=${max_threads_per_task}
-    export APRUN_DWN="${launcher} -n ${ntasks_dwn}"
-
-elif [[ "${step}" = "atmos_products" ]]; then
-
-    export USE_CFP="YES"  # Use MPMD for downstream product generation on Hera
+    export NTHREADS_UPP=${NTHREADS1}
+    export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"
 
 elif [[ "${step}" = "oceanice_products" ]]; then
 
     export NTHREADS_OCNICEPOST=${NTHREADS1}
     export APRUN_OCNICEPOST="${launcher} -n 1 --cpus-per-task=${NTHREADS_OCNICEPOST}"
 
-elif [[ "${step}" = "ecen" ]]; then
-
-    export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN_default}"
-
-    export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
-    [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
-    export APRUN_CHGRES="time"
-
-    export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
-    [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN_default}"
-
-elif [[ "${step}" = "esfc" ]]; then
-
-    export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN_default}"
-
-    export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
-    [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN_default}"
-
-elif [[ "${step}" = "epos" ]]; then
-
-    export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN_default}"
-
-elif [[ "${step}" = "fit2obs" ]]; then
+elif [[ "${step}" = "atmos_products" ]]; then
 
-    export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN_default}"
+    export USE_CFP="YES"  # Use MPMD for downstream product generation on AWS
 
 fi
diff --git a/env/AZUREPW.env b/env/AZUREPW.env
@@ -15,6 +15,7 @@ export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"
 # Configure MPI environment
 export OMP_STACKSIZE=2048000
 export NTHSTACK=1024000000
+export UCX_TLS=ud,sm,self
 
 ulimit -s unlimited
 ulimit -a
@@ -50,6 +51,10 @@ elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}
     export wavempexec=${launcher}
     export wave_mpmd=${mpmd_opt}
 
+elif [[ "${step}" = "prep_emissions" ]]; then
+
+    export APRUN="${APRUN_default}"
+
 elif [[ "${step}" = "post" ]]; then
 
     export NTHREADS_NP=${NTHREADS1}
@@ -71,33 +76,33 @@ elif [[ "${step}" = "oceanice_products" ]]; then
 elif [[ "${step}" = "ecen" ]]; then
 
     export NTHREADS_ECEN=${NTHREADSmax}
-    export APRUN_ECEN="${APRUN}"
+    export APRUN_ECEN="${APRUN_default}"
 
     export NTHREADS_CHGRES=${threads_per_task_chgres:-12}
     [[ ${NTHREADS_CHGRES} -gt ${max_tasks_per_node} ]] && export NTHREADS_CHGRES=${max_tasks_per_node}
     export APRUN_CHGRES="time"
 
     export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
     [[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
-    export APRUN_CALCINC="${APRUN}"
+    export APRUN_CALCINC="${APRUN_default}"
 
 elif [[ "${step}" = "esfc" ]]; then
 
     export NTHREADS_ESFC=${NTHREADSmax}
-    export APRUN_ESFC="${APRUN}"
+    export APRUN_ESFC="${APRUN_default}"
 
     export NTHREADS_CYCLE=${threads_per_task_cycle:-14}
     [[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
-    export APRUN_CYCLE="${APRUN}"
+    export APRUN_CYCLE="${APRUN_default}"
 
 elif [[ "${step}" = "epos" ]]; then
 
     export NTHREADS_EPOS=${NTHREADSmax}
-    export APRUN_EPOS="${APRUN}"
+    export APRUN_EPOS="${APRUN_default}"
 
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/env/GOOGLEPW.env b/env/GOOGLEPW.env
@@ -45,7 +45,7 @@ if [[ "${step}" = "fcst" ]] || [[ "${step}" = "efcs" ]]; then
 
 elif [[ "${step}" = "prep_emissions" ]]; then
 
-    export APRUN
+    export APRUN="${APRUN_default}"
 
 elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then
 
@@ -102,6 +102,6 @@ elif [[ "${step}" = "epos" ]]; then
 elif [[ "${step}" = "fit2obs" ]]; then
 
     export NTHREADS_FIT2OBS=${NTHREADS1}
-    export MPIRUN="${APRUN}"
+    export MPIRUN="${APRUN_default}"
 
 fi
diff --git a/modulefiles/module_base.noaacloud.lua b/modulefiles/module_base.noaacloud.lua
@@ -5,8 +5,11 @@ Load environment to run GFS on noaacloud
 local spack_mod_path=(os.getenv("spack_mod_path") or "None")
 prepend_path("MODULEPATH", spack_mod_path)
 
+load("gnu")
 load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
 load(pathJoin("stack-intel-oneapi-mpi", (os.getenv("stack_impi_ver") or "None")))
+unload("gnu")
+
 load(pathJoin("python", (os.getenv("python_ver") or "None")))
 
 load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))

diff --git a/modulefiles/module_gwci.noaacloud.lua b/modulefiles/module_gwci.noaacloud.lua
@@ -2,10 +2,10 @@ help([[
 Load environment to run GFS workflow setup scripts on noaacloud
 ]])
 
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/ue-env/install/modulefiles/Core")
 
-load(pathJoin("stack-intel", os.getenv("2021.3.0")))
-load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.3.0")))
+load(pathJoin("stack-intel", os.getenv("2021.10.0")))
+load(pathJoin("stack-intel-oneapi-mpi", os.getenv("2021.10.0")))
 
 load(pathJoin("netcdf-c", os.getenv("4.9.2")))
 load(pathJoin("netcdf-fortran", os.getenv("4.6.1")))

diff --git a/modulefiles/module_gwsetup.noaacloud.lua b/modulefiles/module_gwsetup.noaacloud.lua
@@ -4,17 +4,18 @@ Load environment to run GFS workflow setup scripts on noaacloud
 
 load(pathJoin("rocoto"))
 
-prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
+prepend_path("MODULEPATH", "/contrib/spack-stack-rocky8/spack-stack-1.6.0/envs/ue-intel/install/modulefiles/Core")
 
-local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.3.0"
-local python_ver=os.getenv("python_ver") or "3.10.3"
+load("gnu")
+local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
+local stack_mpi_ver=os.getenv("stack_mpi_ver") or "2021.10.0"
 
 load(pathJoin("stack-intel", stack_intel_ver))
-load(pathJoin("python", python_ver))
+load(pathJoin("stack-intel-oneapi-mpi", stack_mpi_ver))
+unload("gnu")
+
 load("py-jinja2")
 load("py-pyyaml")
 load("py-numpy")
-local git_ver=os.getenv("git_ver") or "1.8.3.1"
-load(pathJoin("git", git_ver))
 
 whatis("Description: GFS run setup environment")
diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources
@@ -41,15 +41,15 @@ case ${machine} in
     ;;
   "AWSPW")
     export PARTITION_BATCH="compute"
-    max_tasks_per_node=36
+    max_tasks_per_node=48
     ;;
   "AZUREPW")
     export PARTITION_BATCH="compute"
-    max_tasks_per_node=24
+    max_tasks_per_node=36
     ;;
   "GOOGLEPW")
     export PARTITION_BATCH="compute"
-    max_tasks_per_node=32
+    max_tasks_per_node=30
     ;;
   *)
     echo "FATAL ERROR: Unknown machine encountered by ${BASH_SOURCE[0]}"

diff --git a/parm/config/gefs/config.resources.AWSPW b/parm/config/gefs/config.resources.AWSPW
@@ -9,3 +9,61 @@ unset memory
 for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
   unset "${mem_var}"
 done
+
+step=$1
+
+case ${step} in
+  "fcst" | "efcs")
+    export PARTITION_BATCH="compute"
+    max_tasks_per_node=48
+    ;;
+
+  "arch")
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    ;;
+
+  "prep_emissions")
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    export ntasks=1
+    export threads_per_task=1
+    export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+    ;;
+
+  "waveinit")
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    export ntasks=12
+    export threads_per_task=1
+    export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+    export NTASKS=${ntasks}
+    ;;
+
+  "wavepostpnt")
+    export PARTITION_BATCH="compute"
+    max_tasks_per_node=48
+    export ntasks=240
+    export threads_per_task=1
+    export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+    export NTASKS=${ntasks}
+    ;;
+
+  "wavepostsbs" | "wavepostbndpnt" | "wavepostbndpntbll")
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    export ntasks=24
+    export threads_per_task=1
+    export tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
+    export NTASKS=${ntasks}
+    ;;
+
+  *)
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    ;;
+
+esac
+
+export max_tasks_per_node
+
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -107,16 +107,16 @@ case ${machine} in
     ;;
   "AWSPW")
     export PARTITION_BATCH="compute"
-    npe_node_max=36
-    max_tasks_per_node=36
+    npe_node_max=48
+    max_tasks_per_node=48
     # TODO Supply a max mem/node value for AWS
     # shellcheck disable=SC2034
     mem_node_max=""
     ;;
   "AZUREPW")
     export PARTITION_BATCH="compute"
-    npe_node_max=24
-    max_tasks_per_node=24
+    npe_node_max=36
+    max_tasks_per_node=36
     # TODO Supply a max mem/node value for AZURE
     # shellcheck disable=SC2034
     mem_node_max=""

diff --git a/parm/config/gfs/config.resources.AWSPW b/parm/config/gfs/config.resources.AWSPW
@@ -9,3 +9,27 @@ unset memory
 for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
   unset "${mem_var}"
 done
+
+step=$1
+
+case ${step} in
+  "fcst" | "efcs")
+    export PARTITION_BATCH="compute"
+    max_tasks_per_node=48
+    ;;
+
+  "arch")
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    ;;
+
+
+  *)
+    export PARTITION_BATCH="process"
+    max_tasks_per_node=24
+    ;;
+
+esac
+
+export max_tasks_per_node
+
diff --git a/sorc/build_ufs.sh b/sorc/build_ufs.sh
@@ -12,7 +12,7 @@ EXEC_NAME="gfs_model.x"
 
 while getopts ":da:fj:e:vwy" option; do
   case "${option}" in
-    d) BUILD_TYPE="Debug";;
+    d) BUILD_TYPE="DEBUG";;
     a) APP="${OPTARG}";;
     f) FASTER="ON";;
     j) BUILD_JOBS="${OPTARG}";;

diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd
diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd
diff --git a/versions/build.noaacloud.ver b/versions/build.noaacloud.ver
@@ -1,5 +1,5 @@
-export stack_intel_ver=2021.3.0
-export stack_impi_ver=2021.3.0
+export stack_intel_ver=2021.10.0
+export stack_impi_ver=2021.10.0
 export spack_env=gsi-addon-env
 source "${HOMEgfs:-}/versions/spack.ver"
-export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
+export spack_mod_path="/contrib/spack-stack-rocky8/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
diff --git a/versions/run.noaacloud.ver b/versions/run.noaacloud.ver
@@ -1,8 +1,8 @@
-export stack_intel_ver=2021.3.0
-export stack_impi_ver=2021.3.0
+export stack_intel_ver=2021.10.0
+export stack_impi_ver=2021.10.0
 export spack_env=gsi-addon-env
 
 source "${HOMEgfs:-}/versions/spack.ver"
-export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
+export spack_mod_path="/contrib/spack-stack-rocky8/spack-stack-${spack_stack_ver}/envs/gsi-addon-env/install/modulefiles/Core"
 
 export cdo_ver=2.2.0
diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
@@ -27,5 +27,5 @@ MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
 DO_METP: 'NO'
-SUPPORT_WAVES: 'NO'
-SUPPORTED_RESOLUTIONS: ['C48', 'C96'] # TODO: Test and support all cubed-sphere resolutions.
+SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C192', 'C384', 'C768'] # TODO: Test and support all cubed-sphere resolutions.
+AERO_INPUTS_DIR: /contrib/global-workflow-shared-data/data/gocart_emissions
diff --git a/workflow/hosts/azurepw.yaml b/workflow/hosts/azurepw.yaml
@@ -24,5 +24,7 @@ LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from AZURE.
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
-SUPPORT_WAVES: 'NO'
-SUPPORTED_RESOLUTIONS: ['C48', 'C96'] # TODO: Test and support all cubed-sphere resolutions.
+DO_TRACKER: 'NO'
+DO_GENESIS: 'NO'
+DO_METP: 'NO'
+SUPPORTED_RESOLUTIONS: ['C48', 'C96', 'C384', 'C768'] # TODO: Test and support all cubed-sphere resolutions.
+8 −5		modulefiles/gfsutils_noaacloud.intel.lua
+1 −1		src/ocnicepost.fd/masking_mod.F90
+5 −0		ush/module-setup.sh
+4 −4		docs/source/chgres_cube.rst
+9 −9		docs/source/ufs_utils.rst
+5 −9		fix/link_fixdirs.sh
+64 −0		modulefiles/build.gaeaC6.intel.lua
+7 −10		modulefiles/build.noaacloud.intel.lua
+0 −10		modulefiles/common4noaacloud.lua
+1 −1		reg_tests/cpld_gridgen/rt.sh
+1 −3		reg_tests/ice_blend/driver.jet.sh
+4 −1		sorc/machine-setup.sh
+3 −11		sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt
+319 −20		sorc/orog_mask_tools.fd/orog.fd/io_utils.F90
+0 −4,468		sorc/orog_mask_tools.fd/orog.fd/mtnlm7_oclsm.F
+1,365 −0		sorc/orog_mask_tools.fd/orog.fd/mtnlm7_oclsm.F90
+1,104 −0		sorc/orog_mask_tools.fd/orog.fd/orog_utils.F90
+1 −0		tests/CMakeLists.txt
+23 −0		tests/orog/CMakeLists.txt
+58 −0		tests/orog/ftst_get_ll_angle.F90
+87 −0		tests/orog/ftst_ll2xyz.F90
+44 −0		tests/orog/ftst_minmax.F90
+1 −1		ush/fv3gfs_driver_grid.sh
+1 −1		util/gdas_init/set_fixed_files.sh