Fix remaining bugs up to solver run call

oceanmodeling · Oct 24, 2023 · c7ee41b · c7ee41b
1 parent 13d4268
commit c7ee41b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/singularity/prep/files/setup_ensemble.py b/singularity/prep/files/setup_ensemble.py
@@ -145,7 +145,9 @@ def main(args):
         quadrature=args.quadrature,
         start_date=perturb_begin,
         end_date=model_end_time,
-        overwrite=True
+        overwrite=True,
+        file_deck='b',
+        advisories=['BEST'],
     )
 
     if perturb_begin != model_start_time:
@@ -210,8 +212,9 @@ def parse_arguments():
 
     argument_parser.add_argument(
         '--output-directory',
-        default=None,
         required=True,
+        type=Path,
+        default=None,
         help='path to store generated configuration files'
     )
     argument_parser.add_argument(
@@ -240,6 +243,7 @@ def parse_arguments():
     )
     argument_parser.add_argument(
         '--mesh-directory',
+        type=Path,
         required=True,
         help='path to input mesh (`hgrid.gr3`, `manning.gr3` or `drag.gr3`)',
     )

diff --git a/singularity/scripts/workflow.sh b/singularity/scripts/workflow.sh
@@ -56,6 +56,7 @@ if [ $subset_mesh == 1 ]; then
     KWDS+=" /lustre/grid/HSOFS_250m_v1.0_fixed.14"
     KWDS+=" /lustre/grid/WNAT_1km.14"
     KWDS+=" /lustre/hurricanes/${tag}/windswath"
+    KWDS+=" --rasters /lustre/dem/gebco/*.tif"
 else
     # TODO: Get param_* values from somewhere
     KWDS+="hurricane_mesh"
@@ -74,7 +75,7 @@ KWDS+=" --out /lustre/hurricanes/${tag}/mesh"
 export KWDS
 sbatch --wait --export=ALL,KWDS,STORM=$storm,YEAR=$year $SCRIPT_DIR/mesh.sbatch
 
-singularity run --bind /lustre $SCRIPT_DIR/info.sif setup_ensemble \
+singularity run --bind /lustre $SCRIPT_DIR/prep.sif setup_ensemble \
         --track-file $run_dir/nhc_track/hurricane-track.dat \
         --output-directory $run_dir/setup/ensemble.dir/ \
         --num-perturbations $num_perturb \