ecmwf-ifs · jrbidlot · Dec 20, 2025 · Dec 21, 2025 · Dec 21, 2025 · Dec 22, 2025
diff --git a/share/ecwam/parameters.yml b/share/ecwam/parameters.yml
@@ -47,13 +47,13 @@ parameters:
         mpts:
                 index: 16
                 description: Mean period of total swell
-        '017':
+        awh:
                 index: 17
                 description: Altimeter wave height
-        '018':
+        acwh:
                 index: 18
                 description: Corrected altimeter wave height
-        '019':
+        arrc:
                 index: 19
                 description: Altimeter range correction
         mp1:
@@ -113,61 +113,61 @@ parameters:
         vcu:
                 index: 38
                 description: Northward sea water velocity
-        '039':
+        phioc:
                 index: 39
                 description: Normalised energy flux to ocean
-        '040':
+        phiaw:
                 index: 40
                 description: Normalised energy flux to waves
-        '041':
+        tauoc:
                 index: 41
                 description: Normalised momentum flux to ocean
-        '042':
+        swh1:
                 index: 42
                 description: Swell partition 1 wave height
-        '043':
+        mwd1:
                 index: 43
                 description: Swell partition 1 direction
-        '044':
+        mwp1:
                 index: 44
                 description: Swell partition 1 mean period
-        '045':
+        swh2:
                 index: 45
                 description: Swell partition 2 wave height
-        '046':
+        mwd2:
                 index: 46
                 description: Swell partition 2 direction
-        '047':
+        mwp2:
                 index: 47
                 description: Swell partition 2 mean period
-        '048':
+        swh3:
                 index: 48
                 description: Swell partition 3 wave height
-        '049':
+        mwd3:
                 index: 49
                 description: Swell partition 3 direction
-        '050':
+        mwp3:
                 index: 50
                 description: Swell partition 3 mean period
-        '051':
+        mswsi:
                 index: 51
                 description: Mean square strain in ice
-        '052':
+        sh10:
                 index: 52
                 description: Wave height with period > 10s
-        '053':
+        rhoao:
                 index: 53
                 description: Surface air density
-        '054':
+        wstar:
                 index: 54
                 description: Convective velocity scale
         ci:
                 index: 55
                 description: Sea ice area fraction
-        '056':
+        sithick:
                 index: 56
                 description: Sea ice thickness
-        '057':
+        wss:
                 index: 57
                 description: Spectral skewness
         sic:
@@ -182,52 +182,52 @@ parameters:
         vcurr:
                 index: 61
                 description: V-component of current (NEMO)
-        '062':
+        wefxm:
                 index: 62
                 description: Wave energy flux magnitude
-        '063':
+        wefxd:
                 index: 63
                 description: Wave energy flux direction
-        '064':
+        h1012:
                 index: 64
                 description: Significant wave height 10<=T<=12
-        '065':
+        h1214:
                 index: 65
                 description: Significant wave height 12<=T<=14
-        '066':
+        h1417:
                 index: 66
                 description: Significant wave height 14<=T<=17
-        '067':
+        h1721:
                 index: 67
                 description: Significant wave height 17<=T<=21
-        '068':
+        h2125:
                 index: 68
                 description: Significant wave height 21<=T<=25
-        '069':
+        h2530:
                 index: 69
                 description: Significant wave height 25<=T<=30
-        '070':
+        weta:
                 index: 70
                 description: Wave induced sea level correction
-        '071':
+        wraf:
                 index: 71
                 description: Spectral width index
-        '072':
+        wnslc:
                 index: 72
                 description: Number of freak waves events
-        '073':
+        utaua:
                 index: 73
                 description: U-component atmospheric stress
-        '074':
+        vtaua:
                 index: 74
                 description: V-component atmospheric stress
-        '075':
+        utauo:
                 index: 75
                 description: U-component stress into oceans
-        '076':
+        vtauo:
                 index: 76
                 description: V-component stress into oceans
-        '077':
+        wphio:
                 index: 77
                 description: Turbulence energy flux into oceans
         tdcmax:
@@ -251,4 +251,3 @@ parameters:
         ywrs:
                 index: 84
                 description: V-component wave radiative stress to sea ice
-
diff --git a/share/ecwam/scripts/ecwam_configure.sh b/share/ecwam/scripts/ecwam_configure.sh
@@ -162,16 +162,6 @@ function ecwam_configure {
     amoeap=357.0000
     deptha=5.0
     iper=1
-  elif [[ $wamresol = medite25 ]] ; then
-    xdella=0.2500000
-    amosop=9.00000
-    amonop=90.00000
-    amowep=-98.00000
-    amoeap=42.0000
-    iper=0
-    ##!!
-    cldomain=m
-    ##!!
   elif [[ $wamresol = medite25 ]] ; then
     xdella=0.2500000
     amosop=30.00000
@@ -205,6 +195,23 @@ function ecwam_configure {
     ##!!
     cldomain=m
     ##!!
+  elif [[ $wamresol = lam_highres ]] ; then
+    xdella=0.016666667
+    amosop=30.00000
+    amonop=46.00000
+    amowep=10.00000
+    amoeap=24.0000
+    iper=0
+    deptha=1.0
+    irgg=0
+    fr1=0.055
+    ifre1=1
+    ##!!
+    cldomain=m
+    ##!!
+    llgrib_bathy_out=T
+    llgrib_obstrt_out=T
+    llobstrout=F
   elif [[ $wamresol = onegrdpt ]] ; then
   # one grid point setup
     xdella=0.5000000

diff --git a/share/ecwam/scripts/ecwam_helper_functions.sh b/share/ecwam/scripts/ecwam_helper_functions.sh
@@ -96,18 +96,22 @@ function find_preproc_files() {
 }
 
 function find_preset_files() {
-  date=${1}
+  local date="$1"
+  shift   # remove first argument
+  local -a header_list=("$@")  # remaining arguments become a list
+
   SEARCH_LOCATION=${ECWAM_PRESET_RUN_DIR:-${RUN_DIR}}
   found=true
-  files=(restart/LAW${date}_000000000000 restart/BLS${date}_000000000000)
-  for file in "${files[@]}"; do
+  for header in "${header_list[@]}"; do
+    file="restart/${header}${date}_000000000000"
     if [[ ! ( -r ${SEARCH_LOCATION}/${file} ) ]] ; then
       found=false
     fi
   done
   if $found ; then
     mkdir -p ${RUN_DIR}/restart
-    for file in "${files[@]}"; do
+    for header in "${header_list[@]}"; do
+      file="restart/${header}${date}_000000000000"
       if [[ ! ( -r ${RUN_DIR}/${file} ) ]] ; then
         echo "        ln -sf ${SEARCH_LOCATION}/${file} ${RUN_DIR}/${file}"
         ln -sf ${SEARCH_LOCATION}/${file} ${RUN_DIR}/${file}
@@ -116,7 +120,8 @@ function find_preset_files() {
   else
     builtin echo
     builtin echo "ERROR: Initial condition files not found in ${SEARCH_LOCATION}:"
-    for file in "${files[@]}"; do
+    for header in "${header_list[@]}"; do
+      file="restart/${header}${date}_000000000000"
       if [[ ! ( -r ${SEARCH_LOCATION}/${file} ) ]] ; then
         builtin echo "         - ${file}"
       fi

diff --git a/share/ecwam/scripts/ecwam_run_create_bathymetry.sh b/share/ecwam/scripts/ecwam_run_create_bathymetry.sh
@@ -173,12 +173,12 @@ else
     echo "\n\n\t Getting ETOPO1 data set\n"
     log ${SCRIPTS_DIR}/ecwam_retrieve.sh ${ETOPO1} ${DATA_DIR}/${ETOPO1}
     ln -sf ${DATA_DIR}/${ETOPO1} ETOPO1_Ice_g_int.xyz
-    CREATE_WAM_BATHYMETRY_EXE=${CREATE_WAM_BATHYMETRY_ETOPO1}
+    CREATE_WAM_BATHYMETRY_EXE=${CREATE_WAM_BATHYMETRY_ETOPO1}-${prec}
   else
     echo "\n\n\t Getting ETOPO2 data set\n"
     log ${SCRIPTS_DIR}/ecwam_retrieve.sh ${ETOPO2} ${DATA_DIR}/${ETOPO2}
     ln -sf ${DATA_DIR}/${ETOPO2} etopo2_2006apr.dat
-    CREATE_WAM_BATHYMETRY_EXE=${CREATE_WAM_BATHYMETRY_ETOPO2}
+    CREATE_WAM_BATHYMETRY_EXE=${CREATE_WAM_BATHYMETRY_ETOPO2}-${prec}
   fi
 
   assert_executable_is_available ${CREATE_WAM_BATHYMETRY_EXE} || abort 4
@@ -245,13 +245,20 @@ EOF
   mkdir -p ${DATA_DIR}/data/bathymetry/$(dirname ${WAM_TOPO})
   mv wam_topo_${cwamresol} ${DATA_DIR}/data/bathymetry/${WAM_TOPO}
 
-  for ip in 0 1 2; do
-    if [[ ! -r wam_grib_subgrid_${ip} ]] ; then
-      echo "\n\n\t File wam_grib_subgrid_${ip} does not exist\n\n"
-      abort 9
-    fi
-     mv wam_grib_subgrid_${ip} ${DATA_DIR}/data/bathymetry/${subgrid_files[$ip]}
-  done
+  if [[ $llobstrout = T ]] ; then
+    for ip in 0 1 2; do
+      if [[ ! -r wam_grib_subgrid_${ip} ]] ; then
+        echo "\n\n\t File wam_grib_subgrid_${ip} does not exist\n\n"
+        abort 9
+      fi
+       mv wam_grib_subgrid_${ip} ${DATA_DIR}/data/bathymetry/${subgrid_files[$ip]}
+    done
+  else
+    for ip in 0 1 2
+    do
+      echo "llobstrout was set to false. No need for this file" > ${DATA_DIR}/data/bathymetry/${subgrid_files[$ip]}
+    done
+  fi
 
 fi
 
@@ -264,4 +271,4 @@ for ip in 0 1 2; do
    echo "\n\t wam_grib_subgrid_${ip} is available in DATA_DIR with symlink in RUN_DIR:\n\n\t   ${RUN_DIR}/wam_subgrid_${ip} -> ${DATA_DIR}/data/bathymetry/${subgrid_files[$ip]}"
 done
 
-cleanup
+cleanup