Update JEDI Skylab from v7 to v8 (#185)

* change scripts for skylab v8 * update ctest script * remove jedi_path from module files
ufs-community · Feb 10, 2025 · 1442958 · 1442958
1 parent 43ab349
commit 1442958
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 18 deletions.
diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua
@@ -46,5 +46,3 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "hera.intel")
 
-setenv("EPICHOME", "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1")
-setenv("JEDI_PATH", "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/jedi_v7_ic")
diff --git a/modulefiles/build_hercules_intel.lua b/modulefiles/build_hercules_intel.lua
@@ -49,5 +49,3 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "hercules.intel")
 
-setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA_v2.1")
-setenv("JEDI_PATH", "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v7_ic_hercules")
diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
@@ -49,5 +49,3 @@ setenv("CXX", "mpiicpc")
 setenv("FC", "mpiifort")
 setenv("CMAKE_Platform", "orion.intel")
 
-setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA_v2.1")
-setenv("JEDI_PATH", "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v7_ic_orion")
diff --git a/parm/config_samples/config.LND.coldstart.yaml b/parm/config_samples/config.LND.coldstart.yaml
@@ -21,7 +21,7 @@ MED_COUPLING_MODE: ufs.nfrac.aoflux
 model_ver: v2.1.0
 net: landda
 NPROCS_ANALYSIS: 6
-NPZ: 64
+NPZ: 127
 RES: 96
 RUN: landda
 WE2E_TEST: 'NO'
diff --git a/parm/config_samples/config.LND.warmstart.yaml b/parm/config_samples/config.LND.warmstart.yaml
@@ -21,7 +21,7 @@ MED_COUPLING_MODE: ufs.nfrac.aoflux
 model_ver: v2.1.0
 net: landda
 NPROCS_ANALYSIS: 6
-NPZ: 64
+NPZ: 127
 RES: 96
 RUN: landda
 WE2E_TEST: 'NO'
diff --git a/parm/jedi/GHCN.yaml b/parm/jedi/GHCN.yaml
@@ -1,8 +1,7 @@
   - obs space:
       name: SnowDepthGHCN
       distribution: 
-        name: Halo
-        halo size: 250e3
+        name: InefficientDistribution
       simulated variables: [totalSnowDepth]
       obsdatain:
         engine:

diff --git a/parm/jedi/jedi_letkf_snow.yaml b/parm/jedi/jedi_letkf_snow.yaml
@@ -19,10 +19,9 @@ geometry:
 
 time window:
   begin: {{ yyyp }}-{{ mp }}-{{ dp }}T{{ hp }}:00:00Z
-  length: PT24H
+  length: PT{{ DATE_CYCLE_FREQ_HR }}H
 
 background:
- date: &date {{ yyyy }}-{{ mm }}-{{ dd }}T{{ hh }}:00:00Z
  members:
    - datetime: {{ yyyy }}-{{ mm }}-{{ dd }}T{{ hh }}:00:00Z
      filetype: fms restart
@@ -41,7 +40,7 @@ driver:
   save posterior mean: false
   save posterior mean increment: true
   save posterior ensemble: false
-  run as observer only: {{ driver_obs_only }}
+  update obs config with geometry info: false
 
 local ensemble DA:
   solver: LETKF

diff --git a/parm/setup_wflow_env.py b/parm/setup_wflow_env.py
@@ -257,15 +257,15 @@ def set_machine_parm(machine):
     lowercase_machine = machine.lower()
     match lowercase_machine:
         case "hera":
-            JEDI_PATH = "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/jedi_v7_ic"
+            JEDI_PATH = "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/jedi_v8_ic"
             MAX_CORES_PER_NODE = 40
             WARMSTART_DIR = "/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/inputs/DATA_RESTART"
         case "orion":
-            JEDI_PATH = "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v7_ic_orion"
+            JEDI_PATH = "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v8_ic_orion"
             MAX_CORES_PER_NODE = 40
             WARMSTART_DIR = "/work/noaa/epic/UFS_Land-DA_v2.1/inputs/DATA_RESTART"
         case "hercules":
-            JEDI_PATH = "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v7_ic_hercules"
+            JEDI_PATH = "/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v8_ic_hercules"
             MAX_CORES_PER_NODE = 80
             WARMSTART_DIR = "/work/noaa/epic/UFS_Land-DA_v2.1/inputs/DATA_RESTART"
         case "singularity":

diff --git a/scripts/exlandda_analysis.sh b/scripts/exlandda_analysis.sh
@@ -136,9 +136,9 @@ else # letkf
   'hp': !!str ${HP}
   'fn_orog': C${RES}_oro_data
   'datapath': ${FIXlandda}/FV3_fix_tiled/C${RES}
+  'DATE_CYCLE_FREQ_HR': ${DATE_CYCLE_FREQ_HR}
   'NPZ': ${NPZ}
   'res_p1': ${res_p1}
-  'driver_obs_only': false
 " # End of settings variable
 
   fp_template="${DATA}/${jedi_nml_fn}"

diff --git a/sorc/test/hera_ctest.sh b/sorc/test/hera_ctest.sh
@@ -9,6 +9,7 @@ module use ../../modulefiles
 module load build_hera_intel
 
 export MPIRUN="srun"
+export JEDI_PATH="/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/jedi_v8_ic"
 
 ctest
 

diff --git a/sorc/test/hercules_ctest.sh b/sorc/test/hercules_ctest.sh
@@ -8,6 +8,7 @@ module use ../../modulefiles
 module load build_hercules_intel
 
 export MPIRUN="srun"
+export JEDI_PATH="/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v8_ic_hercules"
 
 ctest
 

diff --git a/sorc/test/orion_ctest.sh b/sorc/test/orion_ctest.sh
@@ -8,6 +8,7 @@ module use ../../modulefiles
 module load build_orion_intel
 
 export MPIRUN="srun"
+export JEDI_PATH="/work/noaa/epic/UFS_Land-DA_v2.1/jedi_v8_ic_orion"
 
 ctest
 

diff --git a/sorc/test/test_letkfoi_snowda.sh b/sorc/test/test_letkfoi_snowda.sh
@@ -66,9 +66,9 @@ settings="\
   'hp': !!str ${HP}
   'fn_orog': C${RES}_oro_data
   'datapath': ${FIXlandda}/FV3_fix_tiled/C${RES}
+  'DATE_CYCLE_FREQ_HR': 24
   'NPZ': 64
   'res_p1': ${RESP1}
-  'driver_obs_only': false
 " # End of settins variable
 fp_template="letkf_land.yaml"
 fn_namelist="letkf_land.yaml"
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ module use ../../modulefiles @@
     module load build_hera_intel
     export MPIRUN="srun"
+    export JEDI_PATH="/scratch2/NAGAPE/epic/UFS_Land-DA_v2.1/jedi_v8_ic"
     ctest
@@ Expand Down @@