[SRW-AQM] Port SRW-AQM to Derecho (ufs-community#1090)

* Port SRW-AQM to Derecho --------- Co-authored-by: Chan-Hoo Jeon <[email protected]> Co-authored-by: Chan-Hoo Jeon <[email protected]> Co-authored-by: Chan-Hoo Jeon <[email protected]> Co-authored-by: Chan-Hoo Jeon <[email protected]>
natalie-perlin · Jun 7, 2024 · 81be59e · 81be59e
1 parent 4c2cede
commit 81be59e
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 25 deletions.
diff --git a/Externals.cfg b/Externals.cfg
@@ -30,7 +30,7 @@ protocol = git
 repo_url = https://github.com/noaa-oar-arl/NEXUS
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = 40346b6
+hash = e153072
 local_path = sorc/arl_nexus
 required = True
 
@@ -39,7 +39,7 @@ protocol = git
 repo_url = https://github.com/NOAA-EMC/AQM-utils
 # Specify either a branch name or a hash but not both.
 #branch = develop
-hash = d953bd1
+hash = e236acd
 local_path = sorc/AQM-utils
 required = True
 

diff --git a/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst b/doc/UsersGuide/CustomizingTheWorkflow/ConfigWorkflow.rst
@@ -156,8 +156,8 @@ These settings define platform-specific run commands. Users should set run comma
 ``RUN_CMD_SERIAL``: (Default: "")
   The run command for some serial jobs.
 
-``RUN_CMD_AQM``: (Default: "")
-  The run command for some AQM tasks.
+``RUN_CMD_NEXUS``: (Default: "")
+  The run command for the AQM NEXUS tasks.
 
 ``RUN_CMD_AQMLBC``: (Default: "")
   The run command for the ``aqm_lbcs`` task.
@@ -271,6 +271,12 @@ These parameters are associated with the fixed (i.e., static) files. On :srw-wik
 ``FIXshp``: (Default: "")
    System directory containing the graphics shapefiles. On Level 1 systems, these are set within the machine files. Users on other systems will need to provide the path to the directory that contains the *Natural Earth* shapefiles.
 
+``FIXaqm``: (Default: "")
+   Path to system directory containing AQM fixed files.
+
+``FIXemis``: (Default: "")
+   Path to system directory containing AQM emission data files.
+
 ``FIXcrtm``: (Default: "")
    Path to system directory containing CRTM fixed files. 
 

diff --git a/modulefiles/tasks/derecho/aqm_ics.local.lua b/modulefiles/tasks/derecho/aqm_ics.local.lua
@@ -1,2 +1,2 @@
-load("nco/5.0.6")
+load("nco/5.1.9")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/aqm_lbcs.local.lua b/modulefiles/tasks/derecho/aqm_lbcs.local.lua
@@ -1,2 +1,2 @@
-load("nco/5.0.6")
+load("nco/5.1.9")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/fire_emission.local.lua b/modulefiles/tasks/derecho/fire_emission.local.lua
@@ -1,2 +1 @@
-load("ncarenv")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/nexus_emission.local.lua b/modulefiles/tasks/derecho/nexus_emission.local.lua
@@ -1,4 +1,2 @@
-load("nco/5.0.6")
-
-load("ncarenv")
+load("nco/5.1.9")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/nexus_gfs_sfc.local.lua b/modulefiles/tasks/derecho/nexus_gfs_sfc.local.lua
@@ -1,2 +1 @@
-load("ncarenv")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/nexus_post_split.local.lua b/modulefiles/tasks/derecho/nexus_post_split.local.lua
@@ -1,4 +1,2 @@
-load("nco/5.0.6")
-
-load("ncarenv")
+load("nco/5.1.9")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/point_source.local.lua b/modulefiles/tasks/derecho/point_source.local.lua
@@ -1,2 +1 @@
-load("ncarenv")
 load("python_srw_aqm")
diff --git a/modulefiles/tasks/derecho/pre_post_stat.local.lua b/modulefiles/tasks/derecho/pre_post_stat.local.lua
@@ -1,2 +1,2 @@
-load("nco/5.0.6")
+load("nco/5.1.9")
 load("python_srw_aqm")
diff --git a/modulefiles/wflow_derecho.lua b/modulefiles/wflow_derecho.lua
@@ -5,8 +5,6 @@ on the CISL machine Derecho (Cray)
 
 whatis([===[Loads libraries for running the UFS SRW Workflow on Derecho ]===])
 
-load("ncarenv")
-
 append_path("MODULEPATH","/glade/work/epicufsrt/contrib/derecho/rocoto/modulefiles")
 load("rocoto")
 

diff --git a/ush/config.aqm.yaml b/ush/config.aqm.yaml
@@ -24,7 +24,7 @@ workflow:
   COLDSTART: false      # set to true for cold start
   WARMSTART_CYCLE_DIR: '/scratch2/NAGAPE/epic/SRW-AQM_DATA/aqm_data/restart/2023111000' # for hera
 #  WARMSTART_CYCLE_DIR: '/work/noaa/epic/SRW-AQM_DATA/aqm_data/restart/2023111000' # for orion/hercules
-#  WARMSTART_CYCLE_DIR: '' # for derecho
+#  WARMSTART_CYCLE_DIR: '/glade/work/chanhooj/SRW-AQM_DATA/aqm_data/restart/2023111000' # for derecho
 nco:
   envir_default: test_aqm_warmstart
   NET_default: aqm

diff --git a/ush/config_defaults.yaml b/ush/config_defaults.yaml
@@ -245,8 +245,8 @@ platform:
   # RUN_CMD_SERIAL:
   # The run command for some serial jobs 
   #
-  # RUN_CMD_AQM:
-  # The run command for some AQM tasks.
+  # RUN_CMD_NEXUS:
+  # The run command for the AQM NEXUS tasks.
   #
   # RUN_CMD_AQMLBC:
   # The run command for the AQM_LBCS task.
@@ -258,9 +258,8 @@ platform:
   RUN_CMD_FCST: ""
   RUN_CMD_POST: ""
   RUN_CMD_PRDGEN: ""
-  RUN_CMD_AQM: ""
+  RUN_CMD_NEXUS: ""
   RUN_CMD_AQMLBC: ""
-
   #
   #-----------------------------------------------------------------------
   #
@@ -421,6 +420,12 @@ platform:
   # FIXshp:
   # System directory where the graphics shapefiles are located.
   # 
+  # FIXaqm:
+  # System directory where AQM data files are located
+  #
+  # FIXemis:
+  # System directory where AQM emission data files are located.
+  #
   # FIXcrtm:
   # System directory where CRTM fixed files are located
   #
@@ -435,6 +440,8 @@ platform:
   FIXorg: ""
   FIXsfc: ""
   FIXshp: ""
+  FIXaqm: ""
+  FIXemis: ""
   FIXcrtm: ""
   FIXcrtmupp: ""
   #

diff --git a/ush/machine/derecho.yaml b/ush/machine/derecho.yaml
@@ -15,8 +15,8 @@ platform:
   RUN_CMD_PRDGEN: mpiexec -n $nprocs 
   RUN_CMD_SERIAL: time
   RUN_CMD_UTILS: mpiexec -n $nprocs 
-  RUN_CMD_NEXUS: mpiexec -n $nprocs 
-  RUN_CMD_AQMLBC: mpiexec -n ${numts}
+  RUN_CMD_NEXUS: /opt/cray/pe/pals/1.2.11/bin/mpiexec -n $nprocs 
+  RUN_CMD_AQMLBC: /opt/cray/pe/pals/1.2.11/bin/mpiexec -n ${numts}
   PRE_TASK_CMDS: '{ ulimit -s unlimited; ulimit -a; }'
   TEST_EXTRN_MDL_SOURCE_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data
   TEST_AQM_INPUT_BASEDIR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/aqm_data
@@ -31,6 +31,8 @@ platform:
   FIXorg: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_orog
   FIXsfc: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/fix/fix_sfc_climo
   FIXshp: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/NaturalEarth
+  FIXaqm: /glade/work/chanhooj/SRW-AQM_DATA/fix_aqm
+  FIXemis: /glade/work/chanhooj/SRW-AQM_DATA/fix_emis
   EXTRN_MDL_DATA_STORES: aws
 data:
   ics_lbcs:
@@ -42,3 +44,7 @@ data:
     HRRR: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data/HRRR/${yyyymmdd}${hh}
     RAP: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data/RAP/${yyyymmdd}${hh}
     GSMGFS: /glade/work/epicufsrt/contrib/UFS_SRW_data/develop/input_model_data/GSMGFS/${yyyymmdd}${hh}
+cpl_aqm_parm:
+  COMINfire_default: /glade/work/chanhooj/SRW-AQM_DATA/aqm_data/RAVE_fire
+  COMINgefs_default: /glade/work/chanhooj/SRW-AQM_DATA/aqm_data/GEFS_DATA
+  NEXUS_GFS_SFC_DIR: /glade/work/chanhooj/SRW-AQM_DATA/aqm_data/GFS_SFC_DATA