From e527b8fbd224d87da4f584fbab28e9f4cf6ee2f5 Mon Sep 17 00:00:00 2001
From: Ahmad Nawab <ahmad.nawab@ecmwf.int>
Date: Thu, 21 Dec 2023 16:34:30 +0000
Subject: [PATCH] FIXUP: scripts

---
 share/ecwam/scripts/ecwam_run_preproc.sh |  2 +-
 share/ecwam/scripts/ecwam_run_preset.sh  | 22 ++++++++++++++++------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/share/ecwam/scripts/ecwam_run_preproc.sh b/share/ecwam/scripts/ecwam_run_preproc.sh
index 6cd5be5e..ec35be7f 100755
--- a/share/ecwam/scripts/ecwam_run_preproc.sh
+++ b/share/ecwam/scripts/ecwam_run_preproc.sh
@@ -121,7 +121,7 @@ cat > procin <<EOF
   LLOBSTRCT= ${llobstrct},
   LLUNSTR =  ${llunstr},
   IFORM=     1,
-  ITEST=     0,
+  ITEST=     2,
   ITESTB=    4,
   IBOUNC=    0,
   IBOUNF=    0, AMOSOC= 0.0, AMONOC= 0.0, AMOWEC= 0.0, AMOEAC= 0.0
diff --git a/share/ecwam/scripts/ecwam_run_preset.sh b/share/ecwam/scripts/ecwam_run_preset.sh
index d8b72a0d..0b9b1f92 100755
--- a/share/ecwam/scripts/ecwam_run_preset.sh
+++ b/share/ecwam/scripts/ecwam_run_preset.sh
@@ -145,9 +145,13 @@ begoffo=$(read_config forcings.at[1].begin --format="%Y%m%d%H%M%S" --default=${e
 
 # MODEL SETUP:
 ##############
+
+wamresol=$(read_config grid)
 wamnang=$(read_config directions)
 wamnfre=$(read_config frequencies)
+wambathy=$(read_config bathymetry)
 
+nproma=$(read_config nproma --default=24)
 forcings_file=$(read_config forcings.file)
 
 opti=1
@@ -164,6 +168,9 @@ assert_executable_is_available ${PRESET} || abort 4
 workdir preset
 ln -sf ../config.yml config.yml
 
+source ${SCRIPTS_DIR}/ecwam_configure.sh
+ecwam_configure $wamresol $wamnfre $wambathy
+
 #. Verify that all input files produced are available
 #.###################################################
 
@@ -192,12 +199,18 @@ ln -s ${DATA_DIR}/${forcings_file} sfcwindin
 cat > PREINFO <<EOF
 &NALINE
  HEADER    = " WAVE MODEL INITIALISATION "
+ NANG      = ${wamnang}
+ NFRE      = 36
+ NFRE_RED  = ${wamnfre}
+ FR1       = ${fr1},
+ IFRE1     = ${ifre1},
  CPATH     = "${WORK_DIR}"
  CDATEA    = "${begofrn}"
  IOPTI     = ${opti}
  ITEST     = 0
- ITESTB    = 0
- ALFA      = 1.800000E-02
+ ITESTB    = 4
+ IDELWI    = 6
+ ALFA      = 0.01
  FM        = ${fmax}
  GAMMA     = 3.000000
  SA        = 7.000000E-02
@@ -205,15 +218,12 @@ cat > PREINFO <<EOF
  THETA     = 0.0
  FETCH     = ${fetch}
  LLUNSTR   = ${llunstr}
- ! IDELWI    =  21600
  CLTUNIT   = "S"
  LGRIBOUT  =  ${lgribout}
  MARSTYPE  = "an"
  YCLASS    = "rd"
  YEXPVER   = "wave"
- NANG      = ${wamnang}
- NFRE      = 36
- NFRE_RED  = ${wamnfre}
+ NPROMA_WAM= ${nproma},
 /
 EOF