Merge branch 'develop' into feature/argo-window

ci/run_ci.sh

@@ -46,15 +46,15 @@ if [[ $TEST_WORKFLOW == 1 ]]; then
     gdasapp_dir=$workflow_dir/sorc/gdas.cd
 
     build_cmd_dir=$workflow_dir/sorc
-    build_cmd="./build_all.sh -ug &>> log.build"
+    build_cmd="./build_all.sh gfs gsi gdas"
     build_dir=$workflow_dir/build
 else
     export BUILD_JOBS=8
 
     gdasapp_dir=$repodir
 
     build_cmd_dir=$gdasapp_dir
-    build_cmd="./build.sh -t $TARGET &>> log.build"
+    build_cmd="./build.sh -t $TARGET"
     build_dir=$gdasapp_dir/build
 fi
 
@@ -74,7 +74,7 @@ echo "---------------------------------------------------" >> $outfile
 cd $build_cmd_dir
 module purge
 rm -rf log.build
-$build_cmd
+$build_cmd &>> log.build
 build_status=$?
 if [ $build_status -eq 0 ]; then
   echo "Build:                                 *SUCCESS*" >> $outfile

parm/aero/jcb-base.yaml.j2

@@ -128,12 +128,6 @@ aero_obsbiascovout_prefix: "{{APREFIX}}"
 aero_obsbiascovout_suffix: ".satbias_cov.nc"
 
 bias_files:
-  atms_n20: rad_varbc_params.tar
-  atms_npp: rad_varbc_params.tar
-  mtiasi_metop-a: rad_varbc_params.tar
-  mtiasi_metop-b: rad_varbc_params.tar
-  amsua_n19: rad_varbc_params.tar
-  ssmis_f17: rad_varbc_params.tar
-  ssmis_f18: rad_varbc_params.tar
-  cris-fsr_n20: rad_varbc_params.tar
-  cris-fsr_npp: rad_varbc_params.tar
+  viirs_npp_aod: aero_varbc_params.tar
+  viirs_n20_aod: aero_varbc_params.tar
+  viirs_n21_aod: aero_varbc_params.tar

parm/io/fv3jedi_fieldmetadata_history.yaml

@@ -58,16 +58,6 @@ field metadata:
 - long name: v_component_of_native_D_grid_wind
   io name: vd
 
-- long name: stc
-  io name: soilt
-
-- long name: soilMoistureVolumetric
-  io name: soilw
-
-# Dummy IO name since stc and soilt are different in JEDI but same in UFS
-- long name: soilt
-  io name: dummy_io_name
-
 - long name: slmsk
   io name: land
 
@@ -91,3 +81,9 @@ field metadata:
 
 - long name: northward_wind_at_surface
   io name: vgrd_hyblev1
+
+- long name: soilm
+  io name: soilw1
+
+- long name: soilt
+  io name: soilt1  

prototypes/gen_prototype.sh

@@ -47,7 +47,7 @@ if [[ $BUILD == 'YES' ]]; then
     cd gdas.cd
     git checkout $GDASHASH
     cd ../
-    ./build_all.sh
+    ./build_all.sh gfs gsi gdas
     ./link_workflow.sh
 fi
 

test/atm/global-workflow/jjob_ens_init_split.sh

@@ -98,15 +98,16 @@ for imem in $(seq 1 $NMEM_ENS); do
     source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
     target=$COM_ATMOS_HISTORY_PREV_ENS
     mkdir -p $target
-    rm -rf $target/enkfgdas.t${gcyc}z.atmf006.nc
-    ln -fs $source/enkfgdas.t${gcyc}z.atmf006.nc $target/
+    file=atmf006.nc
+    rm -rf $target/enkf${gprefix}.${file}
+    ln -fs $source/enkf${gprefix}.${file} $target/enkf${gprefix}.${file}
 
     source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history
     target=$COM_ATMOS_HISTORY_PREV_ENS
     flist=("cubed_sphere_grid_atmf006.nc" "cubed_sphere_grid_sfcf006.nc")
     for file in "${flist[@]}"; do
 	rm -rf $target/enkf${gprefix}.${file}
-        ln -fs $source/enkf${gprefix}.${file} $target/
+        ln -fs $source/enkf${gprefix}.${file} $target/enkf${gprefix}.${file}
     done
 done
 
@@ -116,7 +117,7 @@ cp $EXPDIR/config.base_lobsdiag_forenkf_true $EXPDIR/config.base
 
 # Execute j-job
 if [[ $machine = 'HERA' || $machine = 'ORION' || $machine = 'HERCULES' ]]; then
-    sbatch --ntasks=1 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait --output=atmensanlinit-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
+    sbatch --ntasks=1 --account=$ACCOUNT --qos=batch --time=00:10:00 --export=ALL --wait --output=atmensanlinit_split-%j.out ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
 else
     ${HOMEgfs}/jobs/JGLOBAL_ATMENS_ANALYSIS_INITIALIZE
 fi

test/gw-ci/CMakeLists.txt

@@ -23,6 +23,7 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo
       "gdas_atmos_prod_f009")
   elseif("${task_name}" STREQUAL "enkfgdas_epmn")
     set(subtask_names_list
+      "enkfgdas_epos000"
       "enkfgdas_epos001"
       "enkfgdas_epos002"
       "enkfgdas_epos003"
@@ -84,7 +85,7 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo
     elseif("${task_name}" STREQUAL "gdas_atmanlfinal")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_atmanlfv3inc_${FULL_CYCLE}")
     elseif("${task_name}" STREQUAL "gdas_aeroanlinit")
-      list(APPEND TEST_DEPENDS "${test_prefix}_aeroanlgenb_${HALF_CYCLE}")
+      list(APPEND TEST_DEPENDS "${test_prefix}_gdas_aeroanlgenb_${HALF_CYCLE}")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_prep_${FULL_CYCLE}")
     elseif("${task_name}" STREQUAL "gdas_aeroanlvar")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_aeroanlinit_${FULL_CYCLE}")
@@ -141,7 +142,7 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo
         list(APPEND TEST_DEPENDS "${test_prefix}_gdas_analcalc_${FULL_CYCLE}")
         list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_eupd_${FULL_CYCLE}")
       endif()
-    elseif("${task_name}" STREQUAL "enkfgdas_esnowrecen")
+    elseif("${task_name}" STREQUAL "enkfgdas_esnowanl")
       list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_epmn_${HALF_CYCLE}")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_snowanl_${FULL_CYCLE}")
     elseif("${task_name}" STREQUAL "enkfgdas_esfc")
@@ -151,7 +152,7 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo
       elseif("${pslot}" STREQUAL "C96C48_hybatmaerosnowDA")
         list(APPEND TEST_DEPENDS "${test_prefix}_gdas_analcalc_${FULL_CYCLE}")
         list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_eupd_${FULL_CYCLE}")
-        list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_esnowrecen_${FULL_CYCLE}")
+        list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_esnowanl_${FULL_CYCLE}")
       else()
         list(APPEND TEST_DEPENDS "${test_prefix}_gdas_analcalc_${FULL_CYCLE}")
         list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_eupd_${FULL_CYCLE}")
@@ -163,6 +164,9 @@ function(add_task task_name test_prefix is_full_cycle HALF_CYCLE FULL_CYCLE pslo
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_fcst_${HALF_CYCLE}")
     elseif("${task_name}" STREQUAL "gdas_marinebmat")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_fcst_${HALF_CYCLE}")
+      if("${pslot}" STREQUAL "C48mx500_hybAOWCDA")
+        list(APPEND TEST_DEPENDS "${test_prefix}_enkfgdas_fcst_${HALF_CYCLE}")
+      endif()
     elseif("${task_name}" STREQUAL "gdas_marineanlinit")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_fcst_${HALF_CYCLE}")
       list(APPEND TEST_DEPENDS "${test_prefix}_gdas_prepoceanobs_${FULL_CYCLE}")
@@ -341,7 +345,7 @@ if (WORKFLOW_TESTS)
       "enkfgdas_ediag"
       "enkfgdas_eupd"
       "enkfgdas_ecmn"
-      "enkfgdas_esnowrecen"
+      "enkfgdas_esnowanl"
       "enkfgdas_esfc"
       "enkfgdas_fcst"
     )

test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref

@@ -16,26 +16,26 @@ JEDI Increment:
 
 ----------------------------------------------------------------------------------------------------
 Increment print | number of fields = 8 | cube sphere face size: C48
-eastward_wind                                | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406442199343545e-09
-northward_wind                               | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321568102519878e-09
-air_temperature                              | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529564595995224e-10
-air_pressure_at_surface                      | Min:-2.0471925381571054e-06 Max:+9.5464929472655058e-07 RMS:+4.2656890498660969e-08
-water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346125979528040e-13
-cloud_liquid_ice                             | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630266932071384e-15
-cloud_liquid_water                           | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896344450957455e-14
-ozone_mass_mixing_ratio                      | Min:-1.0347839576407838e-06 Max:+1.3449736530190683e-06 RMS:+3.6860537521399650e-08
+eastward_wind                                | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406454262511763e-09
+northward_wind                               | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321580793695034e-09
+air_temperature                              | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529606676243097e-10
+air_pressure_at_surface                      | Min:-2.0471925381571054e-06 Max:+9.5464929472655058e-07 RMS:+4.2658503304032433e-08
+water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346183757612028e-13
+cloud_liquid_ice                             | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630267261933008e-15
+cloud_liquid_water                           | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896345144255639e-14
+ozone_mass_mixing_ratio                      | Min:-1.0347839576442363e-06 Max:+1.3449736530234745e-06 RMS:+3.6860537521507223e-08
 ----------------------------------------------------------------------------------------------------
 FV3 Increment:
 
 ----------------------------------------------------------------------------------------------------
 Increment print | number of fields = 9 | cube sphere face size: C48
-eastward_wind                                | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406442199343545e-09
-northward_wind                               | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321568102519878e-09
-air_temperature                              | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529564595995224e-10
-water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346125979528040e-13
-cloud_liquid_ice                             | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630266932071384e-15
-cloud_liquid_water                           | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896344450957455e-14
-ozone_mass_mixing_ratio                      | Min:-1.0347839576407838e-06 Max:+1.3449736530190683e-06 RMS:+3.6860537521399650e-08
-air_pressure_thickness                       | Min:-3.8967755244811997e-08 Max:+1.7229922377737239e-08 RMS:+4.3178264898018102e-10
-layer_thickness                              | Min:-1.9750632418435998e-07 Max:+1.8317587091587484e-07 RMS:+3.6300478031517017e-09
+eastward_wind                                | Min:-2.1094110991271009e-07 Max:+1.1717330217209110e-07 RMS:+1.8406454262511763e-09
+northward_wind                               | Min:-1.0218003509976370e-07 Max:+2.6284932985731757e-07 RMS:+1.8321580793695034e-09
+air_temperature                              | Min:-5.2967720876040403e-08 Max:+6.6442652268960956e-08 RMS:+7.1529606676243097e-10
+water_vapor_mixing_ratio_wrt_moist_air       | Min:-3.5909499332409389e-11 Max:+2.5060615908845119e-11 RMS:+2.7346183757612028e-13
+cloud_liquid_ice                             | Min:-5.5298263899525562e-13 Max:+3.6544474506536037e-13 RMS:+3.3630267261933008e-15
+cloud_liquid_water                           | Min:-1.0711521106947577e-11 Max:+3.1052085273756969e-12 RMS:+1.7896345144255639e-14
+ozone_mass_mixing_ratio                      | Min:-1.0347839576442363e-06 Max:+1.3449736530234745e-06 RMS:+3.6860537521507223e-08
+air_pressure_thickness                       | Min:-3.8967755244811997e-08 Max:+1.7229922377737239e-08 RMS:+4.3180294207593410e-10
+layer_thickness                              | Min:-1.9750632418435998e-07 Max:+1.8317587091587484e-07 RMS:+3.6300476680474795e-09
 ----------------------------------------------------------------------------------------------------