Weekly update of JEDI hashes (20260202)

build.sh

@@ -78,7 +78,7 @@ while getopts "w:t:c:hvdfai" opt; do
 done
 
 case ${BUILD_TARGET} in
-  hera | orion | hercules | wcoss2 | noaacloud | gaeac5 | gaeac6 | ursa )
+  hera | orion | hercules | wcoss2 | noaacloud | gaeac6 | ursa )
     echo "Building GDASApp on $BUILD_TARGET"
     source $dir_root/ush/module-setup.sh
     module use $dir_root/modulefiles

parm/jcb-gdas/algorithm/atmosphere/fv3jedi_fv3inc_variational.yaml.j2

@@ -58,9 +58,15 @@ jedi increment geometry:
   layout:
   - {{ atmosphere_layout_x }}
   - {{ atmosphere_layout_y }}
+{% if atmosphere_variational_increment_type == 'gaussian' %}
+  npx: {{ atmosphere_npx_anl }}
+  npy: {{ atmosphere_npy_anl }}
+  npz: {{ atmosphere_npz_anl }}
+{% else %}
   npx: {{ atmosphere_npx_his }}
   npy: {{ atmosphere_npy_his }}
   npz: {{ atmosphere_npz_his }}
+{% endif %}
 fv3 increment geometry:
   fms initialization:
     namelist filename: ./fv3jedi/fmsmpp.nml
@@ -69,9 +75,15 @@ fv3 increment geometry:
   layout:
   - {{ atmosphere_layout_x }}
   - {{ atmosphere_layout_y }}
+{% if atmosphere_variational_increment_type == 'gaussian' %}
+  npx: {{ atmosphere_npx_anl }}
+  npy: {{ atmosphere_npy_anl }}
+  npz: {{ atmosphere_npz_anl }}
+{% else %}
   npx: {{ atmosphere_npx_his }}
   npy: {{ atmosphere_npy_his }}
   npz: {{ atmosphere_npz_his }}
+{% endif %}
 members:
 - background input:
     datapath: ./bkg

parm/jcb-gdas/model/atmosphere/atmosphere_final_increment_cubed_sphere.yaml.j2

@@ -35,6 +35,12 @@ geometry:
   layout:
   - {{atmosphere_layout_x}}
   - {{atmosphere_layout_y}}
+{% if atmosphere_variational_increment_type == 'gaussian' %}
+  npx: {{atmosphere_npx_anl}}
+  npy: {{atmosphere_npy_anl}}
+  npz: {{atmosphere_npz_anl}}
+{% else %}
   npx: {{atmosphere_npx_his}}
   npy: {{atmosphere_npy_his}}
   npz: {{atmosphere_npz_his}}
+{% endif %}

parm/jcb-gdas/model/atmosphere/atmosphere_final_increment_gaussian.yaml.j2

@@ -20,6 +20,6 @@ geometry:
   layout:
   - {{atmosphere_layout_x}}
   - {{atmosphere_layout_y}}
-  npx: {{atmosphere_npx_his}}
-  npy: {{atmosphere_npy_his}}
-  npz: {{atmosphere_npz_his}}
+  npx: {{atmosphere_npx_anl}}
+  npy: {{atmosphere_npy_anl}}
+  npz: {{atmosphere_npz_anl}}

ush/detect_machine.sh

@@ -21,9 +21,6 @@ case $(hostname -f) in
   dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood01-9
   dlogin10.dogwood.wcoss2.ncep.noaa.gov)     MACHINE_ID=wcoss2 ;; ### dogwood10
 
-  gaea5[1-8])          MACHINE_ID=gaeac5 ;; ### gaea51-58
-  gaea5[1-8].ncrc.gov) MACHINE_ID=gaeac5 ;; ### gaea51-58
-
   gaea6[1-8])          MACHINE_ID=gaeac6 ;; ### gaea61-68
   gaea6[1-8].ncrc.gov) MACHINE_ID=gaeac6 ;; ### gaea61-68
 
@@ -93,9 +90,6 @@ elif [[ -d /work ]]; then
   else
     MACHINE_ID=orion
   fi
-elif [[ -d /gpfs/f5 ]]; then
-  # We are on GAEAC5.
-  MACHINE_ID=gaeac5
 elif [[ -d /gpfs/f6 ]]; then
   # We are on GAEAC6.
   MACHINE_ID=gaeac6