Bugfix/ctests (#1425)

NOAA-EMC · Dec 23, 2024 · be0cf45 · be0cf45
1 parent bd06690
commit be0cf45
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/test/atm/global-workflow/jjob_ens_init_split.sh b/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
diff --git a/test/gw-ci/CMakeLists.txt b/test/gw-ci/CMakeLists.txt
@@ -85,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}")
@@ -164,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}")