Merge branch 'develop' into orog_nc

Fixes ufs-community#786.
GeorgeGayno-NOAA · Feb 2, 2024 · e1be717 · e1be717
2 parents d9f17f3 + 6dee392
commit e1be717
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 1,356 deletions.
diff --git a/reg_tests/grid_gen/driver.hercules.sh b/reg_tests/grid_gen/driver.hercules.sh
@@ -30,7 +30,7 @@ module list
 set -x
 ulimit -s unlimited
 
-export WORK_DIR="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export WORK_DIR="${WORK_DIR:-/work2/noaa/stmp/$LOGNAME}"
 export WORK_DIR="${WORK_DIR}/reg-tests/grid-gen"
 QUEUE="${QUEUE:-batch}"
 PROJECT_CODE=${PROJECT_CODE:-fv3-cpu}

diff --git a/reg_tests/weight_gen/driver.hercules.sh b/reg_tests/weight_gen/driver.hercules.sh
@@ -36,7 +36,7 @@ module use ../../modulefiles
 module load build.$target.$compiler
 module list
 
-export DATA="${WORK_DIR:-/work/noaa/stmp/$LOGNAME}"
+export DATA="${WORK_DIR:-/work2/noaa/stmp/$LOGNAME}"
 export DATA="${DATA}/reg-tests/weight_gen"
 
 #-----------------------------------------------------------------------------

diff --git a/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt b/sorc/orog_mask_tools.fd/orog.fd/CMakeLists.txt
@@ -25,7 +25,6 @@ target_include_directories(orog_lib INTERFACE ${mod_dir})
 target_link_libraries(
   orog_lib
   PUBLIC
-  bacio::bacio_4
   w3emc::w3emc_d
   ip::ip_d
   sp::sp_d