IFS-SOURCE-ECWAM-SYNC: update preproc,preset,model runner scripts for…

… updated namelists
ecmwf-ifs · Dec 6, 2023 · 8d6d3e9 · 8d6d3e9
1 parent 88ce0c5
commit 8d6d3e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/share/ecwam/scripts/ecwam_run_model.sh b/share/ecwam/scripts/ecwam_run_model.sh
@@ -76,6 +76,11 @@ for restart_time in $(read_config output.restart.at[:].time --format=%Y%m%d%H%M%
   NAOS+="&NAOS CLSOUT=\"${restart_time}\" /"
 done
 
+# MODEL SETUP:
+##############
+wamnang=$(read_config directions)
+wamnfre=$(read_config frequencies)
+
 nproma=$(read_config nproma --default=24)
 
 # read timesteps
@@ -196,6 +201,9 @@ ln -s ${DATA_DIR}/${forcings_file} sfcwindin
 
 cat > wam_namelist << EOF
 &NALINE
+  NANG                  = ${wamnang},
+  NFRE                  = 36,
+  NFRE_RED              = ${wamnfre},
   CLHEADER              = " WAVE MODEL ",
   CBPLTDT               = "${begofrn}",
   CEPLTDT               = "${endofrn}",

diff --git a/share/ecwam/scripts/ecwam_run_preproc.sh b/share/ecwam/scripts/ecwam_run_preproc.sh
@@ -73,7 +73,6 @@ function cleanup() {
 
 wamresol=$(read_config grid)
 wamnfre=$(read_config frequencies)
-wamnang=$(read_config directions)
 wambathy=$(read_config bathymetry)
 
 assert_executable_is_available ${PREPROC} || abort 33
@@ -111,15 +110,13 @@ cat > procin <<EOF
   NFRE_RED=  ${wamnfre},
   FR1=       ${fr1},
   IFRE1=     ${ifre1},
-  NANG=      ${wamnang},
   IRGG=      ${irgg},
   XDELLA=    ${xdella},
   XDELLO=    ${xdella},
   AMOSOP=    ${amosop},
   AMONOP=    ${amonop},
   AMOWEP=    ${amowep},
   AMOEAP=    ${amoeap},
-  DEPTHA=    ${deptha},
   LAQUA=     ${laqua},
   LLOBSTRCT= ${llobstrct},
   LLUNSTR =  ${llunstr},

diff --git a/share/ecwam/scripts/ecwam_run_preset.sh b/share/ecwam/scripts/ecwam_run_preset.sh
@@ -143,6 +143,11 @@ begofrn=$(read_config begin                --format="%Y%m%d%H%M%S")
 endofrn=$(read_config end                  --format="%Y%m%d%H%M%S")
 begoffo=$(read_config forcings.at[1].begin --format="%Y%m%d%H%M%S" --default=${endofrn} )
 
+# MODEL SETUP:
+##############
+wamnang=$(read_config directions)
+wamnfre=$(read_config frequencies)
+
 forcings_file=$(read_config forcings.file)
 
 opti=1
@@ -206,6 +211,9 @@ cat > PREINFO <<EOF
  MARSTYPE  = "an"
  YCLASS    = "rd"
  YEXPVER   = "wave"
+ NANG      = ${wamnang}
+ NFRE      = 36
+ NFRE_RED  = ${wamnfre}
 /
 EOF