Merge branch 'ufs-community:develop' into text/us-215

ufs-community · Jul 18, 2024 · 6dcb318 · 6dcb318
2 parents 065c15e + 09f445e
commit 6dcb318
Show file tree

Hide file tree

Showing 33 changed files with 2,344 additions and 313 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,7 +12,7 @@ parm/*.out
 parm/*.err
 parm/*.log
 parm/land_analysis.yaml
-parm/log.rocoto_launch
+parm/log.*
 
 __pycache__
 *.swp

diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
@@ -34,6 +34,9 @@ load(pathJoin("mapl", mapl_ver))
 load(pathJoin("prod_util", prod_util_ver))
 load(pathJoin("ufs-pyenv", ufs_pyenv_ver))
 
+setenv("CFLAGS","-diag-disable=10441")
+setenv("FFLAGS","-diag-disable=10441")
+
 setenv("CC", "mpiicc")
 setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")

diff --git a/modulefiles/wflow_orion.lua b/modulefiles/wflow_orion.lua
@@ -6,8 +6,8 @@ the MSU machine Orion
 whatis([===[Loads libraries needed for running the land-DA workflow on Orion ]===])
 
 load("contrib")
-load("rocoto")
-load("wget")
+load("ruby/3.2.3")
+load("rocoto/1.3.7")
 
 unload("python")
 load("conda")

diff --git a/parm/datm_cdeps_lnd_gswp3_rst b/parm/datm_cdeps_lnd_gswp3_rst
diff --git a/parm/land_analysis_hera.yaml b/parm/land_analysis_hera.yaml
@@ -16,12 +16,12 @@ workflow:
     EXP_NAME: "LETKF"
     EXP_BASEDIR: "/scratch2/NAGAPE/epic/{USER}/landda_test"
     JEDI_INSTALL: "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/jedi_v7"
-    WARMSTART_DIR: "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/DATA_RESTART"
+    WARMSTART_DIR: "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/inputs/DATA_RESTART"
     FORCING: "gswp3"   # "gswp3" or "era5"
     RES: "96"
     FCSTHR: "24"
     NPROCS_ANALYSIS: "6"
-    NPROCS_FORECAST: "6"
+    NPROCS_FORECAST: "7"
     OBSDIR: ""
     OBSDIR_SUBDIR: ""
     OBS_TYPES: "GHCN"
@@ -143,7 +143,7 @@ workflow:
         cyc: "&cyc;"
         DAtype: "&DAtype;"
         SNOWDEPTHVAR: "&SNOWDEPTHVAR;"
-        NPROC_JEDI: "&NPROCS_ANALYSIS;"
+        NPROCS_ANALYSIS: "&NPROCS_ANALYSIS;"
         JEDI_INSTALL: "&JEDI_INSTALL;"
       account: "&ACCOUNT;"
       command: '&HOMElandda;/parm/task_load_modules_run_jjob.sh "analysis" "&HOMElandda;" "&MACHINE;"'
@@ -227,6 +227,7 @@ workflow:
         ACCOUNT: "&ACCOUNT;"
         EXP_NAME: "&EXP_NAME;"
         ATMOS_FORC: "&FORCING;"
+        RES: "&RES;"
         WARMSTART_DIR: "&WARMSTART_DIR;"
         model_ver: "&model_ver;"
         HOMElandda: "&HOMElandda;"
@@ -238,6 +239,7 @@ workflow:
         cyc: "&cyc;"
         DAtype: "&DAtype;"
         FCSTHR: "&FCSTHR;"
+        NPROCS_FORECAST: "&NPROCS_FORECAST;"          
       account: "&ACCOUNT;"
       command: '&HOMElandda;/parm/task_load_modules_run_jjob.sh "forecast" "&HOMElandda;" "&MACHINE;"'
       jobname: forecast

diff --git a/parm/land_analysis_orion.yaml b/parm/land_analysis_orion.yaml
@@ -16,12 +16,12 @@ workflow:
     EXP_NAME: "LETKF"
     EXP_BASEDIR: "/work/noaa/epic/{USER}/landda_test"
     JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7_stack1.6"
-    WARMSTART_DIR: "/work/noaa/epic/UFS_Land-DA_Dev/DATA_RESTART"
+    WARMSTART_DIR: "/work/noaa/epic/UFS_Land-DA_Dev/inputs/DATA_RESTART"
     FORCING: "gswp3"   # "gswp3" or "era5"
     RES: "96"
     FCSTHR: "24"
     NPROCS_ANALYSIS: "6"
-    NPROCS_FORECAST: "6"
+    NPROCS_FORECAST: "7"
     OBSDIR: ""
     OBSDIR_SUBDIR: ""
     OBS_TYPES: "GHCN"
@@ -143,7 +143,7 @@ workflow:
         cyc: "&cyc;"
         DAtype: "&DAtype;"
         SNOWDEPTHVAR: "&SNOWDEPTHVAR;"
-        NPROC_JEDI: "&NPROCS_ANALYSIS;"
+        NPROCS_ANALYSIS: "&NPROCS_ANALYSIS;"
         JEDI_INSTALL: "&JEDI_INSTALL;"
       account: "&ACCOUNT;"
       command: '&HOMElandda;/parm/task_load_modules_run_jjob.sh "analysis" "&HOMElandda;" "&MACHINE;"'
@@ -227,6 +227,7 @@ workflow:
         ACCOUNT: "&ACCOUNT;"
         EXP_NAME: "&EXP_NAME;"
         ATMOS_FORC: "&FORCING;"
+        RES: "&RES;"
         WARMSTART_DIR: "&WARMSTART_DIR;"
         model_ver: "&model_ver;"
         HOMElandda: "&HOMElandda;"
@@ -238,6 +239,7 @@ workflow:
         cyc: "&cyc;"
         DAtype: "&DAtype;"
         FCSTHR: "&FCSTHR;"
+        NPROCS_FORECAST: "&NPROCS_FORECAST;"          
       account: "&ACCOUNT;"
       command: '&HOMElandda;/parm/task_load_modules_run_jjob.sh "forecast" "&HOMElandda;" "&MACHINE;"'
       jobname: forecast

diff --git a/parm/launch_rocoto_wflow.sh b/parm/launch_rocoto_wflow.sh
@@ -8,6 +8,7 @@ PARMdir=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )" && pwd -P)
 source ${PARMdir}/detect_platform.sh
 
 # Load rocoto
+module purge
 if [ "${MACHINE}" == "hera" ]; then
   module load rocoto
 elif [ "${MACHINE}" == "orion" ]; then
@@ -16,7 +17,8 @@ elif [ "${MACHINE}" == "orion" ]; then
   module load stack-intel/$stack_intel_ver
   module load stack-python/$stack_python_ver
   module load contrib
-  module load rocoto
+  module load ruby/3.2.3
+  module load rocoto/1.3.7
 else
   echo "FATAL ERROR: modules are not loaded"
 fi
@@ -26,6 +28,7 @@ WFLOW_XML_FN="land_analysis.xml"
 rocoto_xml_bn=$( basename "${WFLOW_XML_FN}" ".xml" )
 rocoto_database_fn="${rocoto_xml_bn}.db"
 WFLOW_LOG_FN="log.rocoto_launch"
+LOG_FN_ROCOTO_RUN="log.rocoto_run"
 
 # Initialize the default status of the workflow to "IN PROGRESS".
 wflow_status="IN PROGRESS"
@@ -43,8 +46,8 @@ if [ "$#" -eq 1 ] && [ "$1" == "add" ]; then
 fi
 
 cd "${PARMdir}"
-rocotorun_cmd="rocotorun -w \"${WFLOW_XML_FN}\" -d \"${rocoto_database_fn}\""
-eval ${rocotorun_cmd}
+rocotorun_cmd="rocotorun -w \"${WFLOW_XML_FN}\" -d \"${rocoto_database_fn}\" -v 10"
+eval ${rocotorun_cmd} > ${LOG_FN_ROCOTO_RUN} 2>&1
 
 rocotostat_output=$( rocotostat -w ${WFLOW_XML_FN} -d ${rocoto_database_fn} )
 

diff --git a/parm/templates/template.datm.streams b/parm/templates/template.datm.streams
@@ -0,0 +1,61 @@
+stream_info:               CLMGSWP3v1.Solar01 CLMGSWP3v1.Precip02 CLMGSWP3v1.TPQW03 topo.observed04
+
+taxmode01:                 limit
+mapalgo01:                 bilinear
+tInterpAlgo01:             coszen
+readMode01:                single
+dtlimit01:                 1.5
+stream_offset01:           0
+yearFirst01:               1999 
+yearLast01:                2000
+yearAlign01:               1999
+stream_vectors01:          null
+stream_mesh_file01:        INPUT/clmforc.GSWP3.c2011.0.5x0.5.TPQWL.SCRIP.210520_ESMFmesh.nc
+stream_lev_dimname01:      null
+stream_data_files01:       "INPUT/clmforc.GSWP3.c2011.0.5x0.5.Solr.1999-12.nc" "INPUT/clmforc.GSWP3.c2011.0.5x0.5.Solr.2000-01.nc"
+stream_data_variables01:   "FSDS Faxa_swdn"
+
+taxmode02:                 limit
+mapalgo02:                 bilinear
+tInterpAlgo02:             nearest
+readMode02:                single
+dtlimit02:                 1.5
+stream_offset02:           0
+yearFirst02:               1999
+yearLast02:                2000
+yearAlign02:               1999
+stream_vectors02:          null
+stream_mesh_file02:        INPUT/clmforc.GSWP3.c2011.0.5x0.5.TPQWL.SCRIP.210520_ESMFmesh.nc
+stream_lev_dimname02:      null
+stream_data_files02:       "INPUT/clmforc.GSWP3.c2011.0.5x0.5.Prec.1999-12.nc" "INPUT/clmforc.GSWP3.c2011.0.5x0.5.Prec.2000-01.nc"
+stream_data_variables02:   "PRECTmms Faxa_precn"
+
+taxmode03:                 limit
+mapalgo03:                 bilinear
+tInterpAlgo03:             linear 
+readMode03:                single
+dtlimit03:                 1.5
+stream_offset03:           0
+yearFirst03:               1999
+yearLast03:                2000
+yearAlign03:               1999
+stream_vectors03:          null
+stream_mesh_file03:        INPUT/clmforc.GSWP3.c2011.0.5x0.5.TPQWL.SCRIP.210520_ESMFmesh.nc
+stream_lev_dimname03:      null
+stream_data_files03:       "INPUT/clmforc.GSWP3.c2011.0.5x0.5.TPQWL.1999-12.nc" "INPUT/clmforc.GSWP3.c2011.0.5x0.5.TPQWL.2000-01.nc"
+stream_data_variables03:   "TBOT Sa_tbot" "WIND Sa_wind" "QBOT Sa_shum" "PSRF Sa_pbot" "PSRF Sa_pslv" "FLDS Faxa_lwdn"
+
+taxmode04:                 cycle
+mapalgo04:                 bilinear
+tInterpAlgo04:             lower
+readMode04:                single
+dtlimit04:                 1.5
+stream_offset04:           0
+yearFirst04:               1
+yearLast04:                1
+yearAlign04:               1
+stream_vectors04:          null
+stream_mesh_file04:        INPUT/topodata_0.9x1.SCRIP.210520_ESMFmesh.nc
+stream_lev_dimname04:      null
+stream_data_files04:       "INPUT/topodata_0.9x1.25_USGS_070110_stream_c151201.nc"
+stream_data_variables04:   "TOPO Sa_topo"
diff --git a/parm/templates/template.datm_in b/parm/templates/template.datm_in
@@ -0,0 +1,14 @@
+&datm_nml
+  datamode = "CLMNCEP"
+  factorfn_data = "null"
+  factorfn_mesh = "null"
+  flds_co2 = .false.
+  flds_presaero = .false.
+  flds_wiso = .false.
+  iradsw = 1
+  model_maskfile = "INPUT/fv1.9x2.5_141008_ESMFmesh.nc"
+  model_meshfile = "INPUT/fv1.9x2.5_141008_ESMFmesh.nc"
+  nx_global = 144
+  ny_global = 96
+  restfilm = "null"
+/