Tweaks to make it run with the new soft linked orog

sanatcumar · Dec 7, 2023 · 5dcb766 · 5dcb766
1 parent 58da591
commit 5dcb766
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/sorc/ocean_merge.fd/merge_lake_ocnmsk.f90 b/sorc/ocean_merge.fd/merge_lake_ocnmsk.f90
@@ -36,6 +36,8 @@ program merge_lake_ocnmsk
 
 
   call read_nml(pth1, pth2, atmres, ocnres, pth3,binary_lake)
+
+  print *, pth1
   nodp_pt=0
   lake_pt=0  
   do tile=1,6

diff --git a/ush/fv3gfs_driver_grid.sh b/ush/fv3gfs_driver_grid.sh
@@ -112,9 +112,10 @@ export home_dir=${home_dir:-"$PWD/../"}
 export script_dir=$home_dir/ush
 export exec_dir=${exec_dir:-"$home_dir/exec"}
 export topo=$home_dir/fix/orog_raw
-
+export ocean_mask_dir=$home_dir/fix/orog
 export NCDUMP=${NCDUMP:-ncdump}
 
+
 rm -fr $TEMP_DIR
 mkdir -p $TEMP_DIR
 cd $TEMP_DIR ||exit 8
@@ -527,7 +528,6 @@ export SAVE_DIR=$out_dir/sfc
 export BASE_DIR=$home_dir
 export FIX_FV3=$out_dir
 export input_sfc_climo_dir=$home_dir/fix/sfc_climo
-export ocean_mask_dir=$home_dir/fix/orog
 
 
 if [ $gtype = regional_gfdl ] || [ $gtype = regional_esg ]; then

diff --git a/ush/fv3gfs_ocean_merge.sh b/ush/fv3gfs_ocean_merge.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
 
+
     results_dir=$TEMP_DIR/ocean_merged/C${res}.mx${ocn}
     mkdir -p ${results_dir}
-
+
+
     cat << EOF > input.nml
      &mask_nml
-     ocean_mask_dir="$ocean_mask_dir/C${res}/ocean_mask/${ocn}/"
+     ocean_mask_dir="$(dirname $(dirname $home_dir))/fix/orog/C${res}/ocean_mask/${ocn}/"
      ocnres="mx${ocn}"
      lake_mask_dir="${TEMP_DIR}/C${res}/orog/"
      atmres="C${res}"