Merge branch 'ufs-community:develop' into ss160-container-update

ufs-community · Oct 24, 2024 · 940edc3 · 940edc3
2 parents 120c106 + 8c93fad
commit 940edc3
Show file tree

Hide file tree

Showing 69 changed files with 2,870 additions and 2,251 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ parm/*.db
 parm/*.out
 parm/*.err
 parm/*.log
+parm/parm_xml.yaml
 parm/land_analysis.yaml
 parm/log.*
 

diff --git a/jobs/JLANDDA_PLOT_STATS b/jobs/JLANDDA_PLOT_STATS
@@ -80,6 +80,8 @@ mkdir -p ${DATA_SHARE}
 export DATA_HOFX="${DATA_HOFX:-${DATAROOT}/DATA_SHARE/hofx}"
 mkdir -p ${DATA_HOFX}
 
+# Set other dates
+export NTIME=$($NDATE 24 $PDY$cyc)
 #
 #-----------------------------------------------------------------------
 #

diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua
@@ -31,6 +31,7 @@ load(pathJoin("sp", sp_ver))
 load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("gftl-shared", gftl_shared_ver))
 load(pathJoin("mapl", mapl_ver))
+load(pathJoin("scotch", scotch_ver))
 load(pathJoin("prod_util", prod_util_ver))
 load(pathJoin("ufs-pyenv", ufs_pyenv_ver))
 

diff --git a/modulefiles/build_hercules_intel.lua b/modulefiles/build_hercules_intel.lua
@@ -31,6 +31,7 @@ load(pathJoin("sp", sp_ver))
 load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("gftl-shared", gftl_shared_ver))
 load(pathJoin("mapl", mapl_ver))
+load(pathJoin("scotch", scotch_ver))
 load(pathJoin("prod_util", prod_util_ver))
 load(pathJoin("ufs-pyenv", ufs_pyenv_ver))
 
@@ -43,4 +44,4 @@ setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "hercules.intel")
 
 setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA_Dev")
-setenv("JEDI_INSTALL", "/work2/noaa/epic/UFS_Land-DA_Dev/jedi_v7_hercules")
+setenv("JEDI_INSTALL", "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7_hercules")
diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
@@ -31,6 +31,7 @@ load(pathJoin("sp", sp_ver))
 load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("gftl-shared", gftl_shared_ver))
 load(pathJoin("mapl", mapl_ver))
+load(pathJoin("scotch", scotch_ver))
 load(pathJoin("prod_util", prod_util_ver))
 load(pathJoin("ufs-pyenv", ufs_pyenv_ver))
 

diff --git a/modulefiles/tasks/hera/task.analysis.lua b/modulefiles/tasks/hera/task.analysis.lua
@@ -5,6 +5,9 @@ load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
 load(pathJoin("stack-python", stack_python_ver))
 
 load(pathJoin("prod_util", prod_util_ver))
+
+load(pathJoin("py-jinja2", py_jinja2_ver))
 load(pathJoin("py-netcdf4", py_netcdf4_ver))
 load(pathJoin("py-numpy", py_numpy_ver))
+load(pathJoin("py-pyyaml", py_pyyaml_ver))
 
diff --git a/modulefiles/tasks/hera/task.forecast.lua b/modulefiles/tasks/hera/task.forecast.lua
@@ -23,6 +23,9 @@ load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("gftl-shared", gftl_shared_ver))
 load(pathJoin("mapl", mapl_ver))
 load(pathJoin("prod_util", prod_util_ver))
+
+load(pathJoin("py-jinja2", py_jinja2_ver))
 load(pathJoin("py-netcdf4", py_netcdf4_ver))
 load(pathJoin("py-numpy", py_numpy_ver))
+load(pathJoin("py-pyyaml", py_pyyaml_ver))
 
diff --git a/modulefiles/tasks/hera/task.plot_stats.lua b/modulefiles/tasks/hera/task.plot_stats.lua
@@ -1,4 +1,4 @@
-prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
+prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_unienv"))
 
 load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_intel_oneapi_mpi_ver))
@@ -9,6 +9,7 @@ load(pathJoin("py-cartopy", py_cartopy_ver))
 load(pathJoin("py-matplotlib", py_matplotlib_ver))
 load(pathJoin("py-netcdf4", py_netcdf4_ver))
 load(pathJoin("py-numpy", py_numpy_ver))
+load(pathJoin("py-pandas", py_pandas_ver))
 load(pathJoin("py-pyyaml", py_pyyaml_ver))
 load(pathJoin("py-scipy", py_scipy_ver))
 load(pathJoin("py-xarray", py_xarray_ver))

diff --git a/modulefiles/tasks/hera/task.post_anal.lua b/modulefiles/tasks/hera/task.post_anal.lua
@@ -8,6 +8,9 @@ load(pathJoin("hdf5", hdf5_ver))
 load(pathJoin("netcdf-c", netcdf_c_ver))
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 load(pathJoin("prod_util", prod_util_ver))
+
+load(pathJoin("py-jinja2", py_jinja2_ver))
 load(pathJoin("py-netcdf4", py_netcdf4_ver))
 load(pathJoin("py-numpy", py_numpy_ver))
+load(pathJoin("py-pyyaml", py_pyyaml_ver))
 
diff --git a/modulefiles/tasks/hera/task.pre_anal.lua b/modulefiles/tasks/hera/task.pre_anal.lua
@@ -8,3 +8,7 @@ load(pathJoin("hdf5", hdf5_ver))
 load(pathJoin("netcdf-c", netcdf_c_ver))
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
 load(pathJoin("prod_util", prod_util_ver))
+
+load(pathJoin("py-jinja2", py_jinja2_ver))
+load(pathJoin("py-pyyaml", py_pyyaml_ver))
+
diff --git a/modulefiles/tasks/hercules b/modulefiles/tasks/hercules
@@ -0,0 +1 @@
+hera
diff --git a/modulefiles/tasks/hercules/task.analysis.lua b/modulefiles/tasks/hercules/task.analysis.lua
diff --git a/modulefiles/tasks/hercules/task.forecast.lua b/modulefiles/tasks/hercules/task.forecast.lua
diff --git a/modulefiles/tasks/hercules/task.plot_stats.lua b/modulefiles/tasks/hercules/task.plot_stats.lua
diff --git a/modulefiles/tasks/hercules/task.post_anal.lua b/modulefiles/tasks/hercules/task.post_anal.lua
diff --git a/modulefiles/tasks/hercules/task.pre_anal.lua b/modulefiles/tasks/hercules/task.pre_anal.lua
diff --git a/modulefiles/tasks/hercules/task.prep_obs.lua b/modulefiles/tasks/hercules/task.prep_obs.lua
diff --git a/modulefiles/tasks/orion b/modulefiles/tasks/orion
@@ -0,0 +1 @@
+hera
diff --git a/modulefiles/tasks/orion/task.analysis.lua b/modulefiles/tasks/orion/task.analysis.lua
diff --git a/modulefiles/tasks/orion/task.forecast.lua b/modulefiles/tasks/orion/task.forecast.lua
diff --git a/modulefiles/tasks/orion/task.plot_stats.lua b/modulefiles/tasks/orion/task.plot_stats.lua
diff --git a/modulefiles/tasks/orion/task.post_anal.lua b/modulefiles/tasks/orion/task.post_anal.lua
diff --git a/modulefiles/tasks/orion/task.pre_anal.lua b/modulefiles/tasks/orion/task.pre_anal.lua
diff --git a/modulefiles/tasks/orion/task.prep_obs.lua b/modulefiles/tasks/orion/task.prep_obs.lua
diff --git a/parm/jedi/GHCN.yaml b/parm/jedi/GHCN.yaml
@@ -7,11 +7,11 @@
       obsdatain:
         engine:
           type: H5File
-          obsfile: GHCN_XXYYYYXXMMXXDDXXHH.nc
+          obsfile: GHCN_{{ yyyymmddhh }}.nc
       obsdataout:
         engine:
           type: H5File
-          obsfile: output/DA/hofx/letkf_hofx_ghcn_XXYYYYXXMMXXDDXXHH.nc
+          obsfile: output/DA/hofx/letkf_hofx_ghcn_{{ yyyymmddhh }}.nc
     obs operator:
       name: Identity
     obs error:

diff --git a/parm/jedi/letkfoi_snow.yaml b/parm/jedi/letkfoi_snow.yaml
@@ -3,45 +3,45 @@ geometry:
     namelist filename: Data/fv3files/fmsmpp.nml
     field table filename: Data/fv3files/field_table
   akbk: Data/fv3files/akbk64.nc4
-  npx: XXREP
-  npy: XXREP
+  npx: {{ resp1 }}
+  npy: {{ resp1 }}
   npz: 64
   field metadata override: gfs-land.yaml
   time invariant fields:
     state fields:
-      datetime: XXYYYP-XXMP-XXDPTXXHP:00:00Z
+      datetime: {{ yyyp }}-{{ mp }}-{{ dp }}T{{ hp }}:00:00Z
       filetype: fms restart
       skip coupler file: true
       state variables: [orog_filt]
-      datapath: XXTPATH
-      filename_orog: XXTSTUB.nc
+      datapath: {{ tpath }}
+      filename_orog: {{ tstub }}.nc
     derived fields: [nominal_surface_pressure]
 
 time window:
-  begin: XXYYYP-XXMP-XXDPTXXHP:00:00Z
+  begin: {{ yyyp }}-{{ mp }}-{{ dp }}T{{ hp }}:00:00Z
   length: PT24H
 
 background:
- date: &date XXYYYY-XXMM-XXDDTXXHH:00:00Z
+ date: &date {{ yyyy }}-{{ mm }}-{{ dd }}T{{ hh }}:00:00Z
  members:
-   - datetime: XXYYYY-XXMM-XXDDTXXHH:00:00Z
+   - datetime: {{ yyyy }}-{{ mm }}-{{ dd }}T{{ hh }}:00:00Z
      filetype: fms restart
      state variables: [snwdph,vtype,slmsk]
      datapath: mem_pos/
-     filename_sfcd: XXYYYYXXMMXXDD.XXHH0000.sfc_data.nc
-     filename_cplr: XXYYYYXXMMXXDD.XXHH0000.coupler.res
-   - datetime: XXYYYY-XXMM-XXDDTXXHH:00:00Z
+     filename_sfcd: {{ yyyymmdd }}.{{ hh }}0000.sfc_data.nc
+     filename_cplr: {{ yyyymmdd }}.{{ hh }}0000.coupler.res
+   - datetime: {{ yyyy }}-{{ mm }}-{{ dd }}T{{ hh }}:00:00Z
      filetype: fms restart
      state variables: [snwdph,vtype,slmsk]
      datapath: mem_neg/
-     filename_sfcd: XXYYYYXXMMXXDD.XXHH0000.sfc_data.nc
-     filename_cplr: XXYYYYXXMMXXDD.XXHH0000.coupler.res
+     filename_sfcd: {{ yyyymmdd }}.{{ hh }}0000.sfc_data.nc
+     filename_cplr: {{ yyyymmdd }}.{{ hh }}0000.coupler.res
 
 driver:
   save posterior mean: false
   save posterior mean increment: true
   save posterior ensemble: false
-  run as observer only: XXHOFX
+  run as observer only: {{ driver_obs_only }}
 
 local ensemble DA:
   solver: LETKF