Update JEDI hashes (20250423)

ci/run_ci.sh

@@ -41,6 +41,7 @@ done
 
 if [[ $TEST_WORKFLOW == 1 ]]; then
     export WORKFLOW_BUILD="ON"
+    export WORKFLOW_TESTS="ON"
 
     workflow_dir=$repodir
     gdasapp_dir=$workflow_dir/sorc/gdas.cd
@@ -98,12 +99,12 @@ fi
 # role.jedipara and role-da can run g-w based ctests.
 if [[ $TEST_WORKFLOW == 1 ]]; then
   if [[ "${TARGET}" = "hera" ]]; then
-    echo "***WARNING*** apply ${TARGET} global-->da patch to $workflow_dir/workflow/hosts/${TARGET}.yaml"
-    sed -i "s|/scratch1/NCEPDEV/global/\${USER}|/scratch1/NCEPDEV/da/\${USER}|g" $workflow_dir/workflow/hosts/${TARGET}.yaml
+    echo "***WARNING*** apply ${TARGET} global-->da patch to $workflow_dir/dev/workflow/hosts/${TARGET}.yaml"
+    sed -i "s|/scratch1/NCEPDEV/global/\${USER}|/scratch1/NCEPDEV/da/\${USER}|g" $workflow_dir/dev/workflow/hosts/${TARGET}.yaml
   fi
   if [[ "${TARGET}" = "orion" || "${TARGET}" = "hercules" ]]; then
-    echo "***WARNING*** apply MSU stmp patch to $workflow_dir/workflow/hosts/${TARGET}.yaml"
-    sed -i "s|/work2/noaa/global/\${USER}|/work2/noaa/da/\${USER}|g" $workflow_dir/workflow/hosts/${TARGET}.yaml
+    echo "***WARNING*** apply MSU stmp patch to $workflow_dir/dev/workflow/hosts/${TARGET}.yaml"
+    sed -i "s|/work2/noaa/global/\${USER}|/work2/noaa/da/\${USER}|g" $workflow_dir/dev/workflow/hosts/${TARGET}.yaml
   fi
 fi
 # PATCH END

test/atm/global-workflow/jjob_var_run.sh

@@ -50,7 +50,7 @@ fi
 
 # Execute j-job
 if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then
-    sbatch --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait --output=atmanlvar-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
+    sbatch --ntasks=6 --account=$ACCOUNT --qos=batch --time=00:20:00 --export=ALL --wait --output=atmanlvar-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
 else
     ${HOMEgfs}/jobs/JGLOBAL_ATM_ANALYSIS_VARIATIONAL
 fi

test/testreference/atm_jjob_3dvar-fv3inc.ref

@@ -5,37 +5,37 @@ State print | number of fields = 9 | cube sphere face size: C48
 eastward_wind                                | Min:-5.5495644220059390e+01 Max:+8.4934651204487366e+01 RMS:+1.6388250288532191e+01
 northward_wind                               | Min:-7.3712421229093422e+01 Max:+7.6984825502186652e+01 RMS:+8.1424144891567511e+00
 air_temperature                              | Min:+1.7482158077318496e+02 Max:+3.1467235233685437e+02 RMS:+2.4978424883064508e+02
-surface_pressure                             | Min:+5.3298485514404747e+04 Max:+1.0398027192902798e+05 RMS:+9.8897229693652524e+04
-specific_humidity                            | Min:+1.2691624667179020e-08 Max:+2.0041369334954085e-02 RMS:+4.7792638023125686e-03
+air_pressure_at_surface                      | Min:+5.3298485514404747e+04 Max:+1.0398027192902798e+05 RMS:+9.8897229693652524e+04
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+1.2691624667179020e-08 Max:+2.0041369334954085e-02 RMS:+4.7792638023125686e-03
 cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+1.2024392024662985e-03 RMS:+1.4396968866569995e-05
 cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.5935686618789048e-03 RMS:+4.1931345590543333e-05
 ozone_mass_mixing_ratio                      | Min:+1.1998327271379204e-08 Max:+1.7808431790670831e-05 RMS:+4.4947917149861064e-06
-surface_geopotential_height                  | Min:-2.7018394470214844e+01 Max:+5.2697460937500000e+03 RMS:+6.3032575784066080e+02
+geopotential_height_at_surface               | Min:-2.7018394470214844e+01 Max:+5.2697460937500000e+03 RMS:+6.3032575784066080e+02
 ----------------------------------------------------------------------------------------------------
 JEDI Increment:
 
 ----------------------------------------------------------------------------------------------------
 Increment print | number of fields = 8 | cube sphere face size: C48
-eastward_wind                                | Min:-4.9503077015344843e-07 Max:+7.0838511279092131e-07 RMS:+2.4490899978286723e-09
-northward_wind                               | Min:-7.2703516684757830e-07 Max:+2.8853321110133834e-07 RMS:+2.1376104971902294e-09
-air_temperature                              | Min:-2.1723477061641461e-07 Max:+6.5020122974601691e-07 RMS:+1.0998492962503341e-08
-surface_pressure                             | Min:-7.8580342233181000e-10 Max:+3.2014213502407074e-10 RMS:+1.5159255545534699e-11
-specific_humidity                            | Min:-6.7425976452941262e-04 Max:+7.2974731745455677e-04 RMS:+2.1043490698817701e-06
-cloud_liquid_ice                             | Min:-2.7736911125384438e-06 Max:+5.0834107240617123e-07 RMS:+4.7607939912271645e-08
-cloud_liquid_water                           | Min:-3.7332445167104997e-04 Max:+3.4355489504058373e-04 RMS:+3.0033170533500212e-06
+eastward_wind                                | Min:-3.9580231181446379e-07 Max:+5.6638998024993725e-07 RMS:+1.9581721840491375e-09
+northward_wind                               | Min:-5.8130164426462017e-07 Max:+2.3069699750521977e-07 RMS:+1.7091284599910894e-09
+air_temperature                              | Min:-1.7369023908031522e-07 Max:+5.1986899052280933e-07 RMS:+8.8032349524548263e-09
+air_pressure_at_surface                      | Min:-6.2573235481977463e-10 Max:+2.4738255888223648e-10 RMS:+1.1987479059078726e-11
+water_vapor_mixing_ratio_wrt_moist_air       | Min:-5.8112479846974684e-04 Max:+6.8835974478701075e-04 RMS:+1.8952713643934993e-06
+cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
+cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
 ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
 ----------------------------------------------------------------------------------------------------
 FV3 Increment:
 
 ----------------------------------------------------------------------------------------------------
 Increment print | number of fields = 9 | cube sphere face size: C48
-eastward_wind                                | Min:-4.9503077015344843e-07 Max:+7.0838511279092131e-07 RMS:+2.4490899978286723e-09
-northward_wind                               | Min:-7.2703516684757830e-07 Max:+2.8853321110133834e-07 RMS:+2.1376104971902294e-09
-air_temperature                              | Min:-2.1723477061641461e-07 Max:+6.5020122974601691e-07 RMS:+1.0998492962503341e-08
-specific_humidity                            | Min:-6.7425976452941262e-04 Max:+7.2974731745455677e-04 RMS:+2.1043490698817701e-06
-cloud_liquid_ice                             | Min:-2.7736911125384438e-06 Max:+5.0834107240617123e-07 RMS:+4.7607939912271645e-08
-cloud_liquid_water                           | Min:-3.7332445167104997e-04 Max:+3.4355489504058373e-04 RMS:+3.0033170533500212e-06
+eastward_wind                                | Min:-3.9580231181446379e-07 Max:+5.6638998024993725e-07 RMS:+1.9581721840491375e-09
+northward_wind                               | Min:-5.8130164426462017e-07 Max:+2.3069699750521977e-07 RMS:+1.7091284599910894e-09
+air_temperature                              | Min:-1.7369023908031522e-07 Max:+5.1986899052280933e-07 RMS:+8.8032349524548263e-09
+water_vapor_mixing_ratio_wrt_moist_air       | Min:-5.8112479846974684e-04 Max:+6.8835974478701075e-04 RMS:+1.8952713643934993e-06
+cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
+cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
 ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+0.0000000000000000e+00 RMS:+0.0000000000000000e+00
-air_pressure_thickness                       | Min:-2.9103830456733704e-11 Max:+2.9103830456733704e-11 RMS:+3.3056019160193798e-13
-layer_thickness                              | Min:-1.0638235174337751e-01 Max:+1.0329449278924585e-01 RMS:+2.8485086711777381e-04
+air_pressure_thickness                       | Min:-2.9103830456733704e-11 Max:+2.9103830456733704e-11 RMS:+3.0737529712448059e-13
+layer_thickness                              | Min:-1.0034473039831937e-01 Max:+9.2799604382889811e-02 RMS:+2.5891560066661575e-04
 ----------------------------------------------------------------------------------------------------