ecmwf-ifs · jkousal32 · Jun 4, 2025 · Jun 5, 2025 · Jun 6, 2025 · Jun 11, 2025
diff --git a/.gitignore b/.gitignore
@@ -16,5 +16,6 @@ ecbundle
 *.DS_Store
 .vscode
 *.mod
+x*.sh
 __pycache__/
 
diff --git a/share/ecwam/scripts/ecwam_run_model.sh b/share/ecwam/scripts/ecwam_run_model.sh
@@ -83,8 +83,10 @@ wamnfre=$(read_config frequencies)
 
 nproma=$(read_config nproma --default=24)
 iphys=$(read_config iphys --default=1)
+iphys2_airsea=$(read_config iphys2_airsea --default=0)
 llgcbz0=$(read_config llgcbz0 --default=F)
 llnormagam=$(read_config llnormagam --default=F)
+lllowwinds=$(read_config lllowwinds --default=F)
 irefra=$(read_config irefra --default=0)
 lciwa1=$(read_config lciwa1 --default=F)
 lciwa2=$(read_config lciwa2 --default=F)
@@ -228,12 +230,14 @@ cat > wam_namelist << EOF
   LFDBIOOUT             = F,
   LFDB                  = F,
   IPHYS                 = ${iphys},
+  IPHYS2_AIRSEA         = ${iphys2_airsea},
   ISHALLO               = 0,
   ISNONLIN              = 0,
   LBIWBK                = T,
   LLCAPCHNK             = T,
   LLGCBZ0               = ${llgcbz0},
   LLNORMAGAM            = ${llnormagam},
+  LLLOWWINDS            = ${lllowwinds},
   IPROPAGS              = 2,
   LSUBGRID              = F,
   IREFRA                = ${irefra},

diff --git a/src/ecwam/CMakeLists.txt b/src/ecwam/CMakeLists.txt
@@ -48,11 +48,14 @@ list( APPEND ecwam_srcs
   abort1.F90
   adjust.F90
   airsea.F90
+  airsea_jan.F90
+  airsea_bydrz.F90
   aki.F90
   aki_ice.F90
   alphap_tail.F90
   bouinpt.F90
   buildstress.F90
+  calcphiwa.F90
   cal_second_order_spec.F90
   cdustarz0.F90
   check.F90
@@ -100,6 +103,7 @@ list( APPEND ecwam_srcs
   incdate.F90
   inisnonlin.F90
   init_fieldg.F90
+  init_freqext.F90
   init_sdiss_ardh.F90
   init_x0tauhf.F90
   initdpthflds.F90
@@ -120,6 +124,7 @@ list( APPEND ecwam_srcs
   ktoobs.F90
   kurtosis.F90
   kzeone.F90
+  lfactor.F90
   makegrid.F90
   mblock.F90
   mbounc.F90
@@ -217,6 +222,7 @@ list( APPEND ecwam_srcs
   sdissip.F90
   sdissip_ard.F90
   sdissip_jan.F90
+  sdissip_bydrz.F90
   sdiwbk.F90
   sdice.F90
   sdice1.F90
@@ -238,6 +244,8 @@ list( APPEND ecwam_srcs
   setmarstype.F90
   setwavphys.F90
   sinflx.F90
+  sinflx_bydrz.F90
+  sinflx_ard_jan.F90
   sinput.F90
   sinput_ard.F90
   sinput_jan.F90
@@ -252,10 +260,13 @@ list( APPEND ecwam_srcs
   stress_gc.F90
   stresso.F90
   strspec.F90
+  swldissip_bydrz.F90
   tables_2nd.F90
   tabu_swellft.F90
   tau_phi_hf.F90
+  tau_wave_atmos.F90
   taut_z0.F90
+  tauwindsxy.F90
   topoar.F90
   transf.F90
   transf_bfi.F90

diff --git a/src/ecwam/airsea.F90 b/src/ecwam/airsea.F90
@@ -29,20 +29,17 @@ SUBROUTINE AIRSEA (KIJS, KIJL, &
 !**   INTERFACE.
 !     ----------
 
-!       *CALL* *AIRSEA (KIJS, KIJL, FL1, WAVNUM,
-!                       HALP, U10, U10DIR, TAUW, TAUWDIR, RNFAC,
-!                       US, Z0, Z0B, CHRNCK, ICODE_WND, IUSFG)*
+!       *CALL* *AIRSEA (KIJS, KIJL,
+!                       U10, U10DIR, TAUW, TAUWDIR,
+!                       US, Z0, Z0B, CHRNCK, ICODE_WND, IUSFG,
+!                       HALP, RNFAC)*
 
 !          *KIJS*    - INDEX OF FIRST GRIDPOINT.
 !          *KIJL*    - INDEX OF LAST GRIDPOINT.
-!          *FL1*     - SPECTRA
-!          *WAVNUM*  - WAVE NUMBER
-!          *HALP*    - 1/2 PHILLIPS PARAMETER
 !          *U10*     - WINDSPEED U10.
 !          *U10DIR*  - WINDSPEED DIRECTION.
 !          *TAUW*    - WAVE STRESS.
 !          *TAUWDIR* - WAVE STRESS DIRECTION.
-!          *RNFAC*   - WIND DEPENDENT FACTOR USED IN THE GROWTH RENORMALISATION.
 !          *US*      - OUTPUT OR OUTPUT BLOCK OF FRICTION VELOCITY.
 !          *Z0*      - OUTPUT BLOCK OF ROUGHNESS LENGTH.
 !          *Z0B*     - BACKGROUND ROUGHNESS LENGTH.
@@ -52,6 +49,8 @@ SUBROUTINE AIRSEA (KIJS, KIJL, &
 !                     US:  ICODE_WND=1 OR 2 --> U10 will be updated
 !          *IUSFG*   - IF = 1 THEN USE THE FRICTION VELOCITY (US) AS FIRST GUESS in TAUT_Z0
 !                           0 DO NOT USE THE FIELD US 
+!          *HALP*    - OPTIONAL 1/2 PHILLIPS PARAMETER (required for JAN branch).
+!          *RNFAC*   - OPTIONAL WIND-DEPENDENT GROWTH RENORMALISATION FACTOR (required for JAN branch).
 
 
 ! ----------------------------------------------------------------------
@@ -62,20 +61,22 @@ SUBROUTINE AIRSEA (KIJS, KIJL, &
       USE YOWPHYS,  ONLY : XKAPPA, XNLEV
       USE YOWTEST,  ONLY : IU06
       USE YOWWIND,  ONLY : WSPMIN
+      USE YOWSTAT,  ONLY : IPHYS
 
       USE YOMHOOK, ONLY: LHOOK, DR_HOOK, JPHOOK
 
 ! ----------------------------------------------------------------------
       IMPLICIT NONE
 
 #include "abort1.intfb.h"
-#include "taut_z0.intfb.h"
-#include "z0wave.intfb.h"
+#include "airsea_jan.intfb.h"
+#include "airsea_bydrz.intfb.h"
 
       INTEGER(KIND=JWIM), INTENT(IN) :: KIJS, KIJL, ICODE_WND, IUSFG
-      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (IN) :: HALP, U10DIR, TAUW, TAUWDIR, RNFAC
-      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (INOUT) :: U10, US
-      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (OUT) :: Z0, Z0B, CHRNCK
+      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (IN), OPTIONAL :: HALP, RNFAC
+      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (IN) :: U10DIR, TAUW, TAUWDIR
+      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (INOUT) :: U10, US, CHRNCK
+      REAL(KIND=JWRB), DIMENSION(KIJL), INTENT (OUT) :: Z0, Z0B 
 
       INTEGER(KIND=JWIM) :: IJ, I, J
 
@@ -87,45 +88,24 @@ SUBROUTINE AIRSEA (KIJS, KIJL, &
 ! ----------------------------------------------------------------------
       IF (LHOOK) CALL DR_HOOK ('AIRSEA', 0, ZHOOK_HANDLE)
 
-!*    2. DETERMINE TOTAL STRESS (if needed)
-!        ----------------------------------
-
-      IF (ICODE_WND == 3) THEN
-
-        !$loki inline
-        CALL TAUT_Z0 (KIJS, KIJL, IUSFG,          &
-     &                HALP, U10, U10DIR, TAUW, TAUWDIR, RNFAC, &
-     &                US, Z0, Z0B, CHRNCK)
-
-      ELSEIF (ICODE_WND == 1 .OR. ICODE_WND == 2) THEN
-
-!$loki remove
-!*    3. DETERMINE ROUGHNESS LENGTH (if needed).
-!        ---------------------------
-
-        !$loki inline
-        CALL Z0WAVE (KIJS, KIJL, US, TAUW, U10, Z0, Z0B, CHRNCK)
-
-!*    3. DETERMINE U10 (if needed).
-!        ---------------------------
-
-        XKAPPAD = 1.0_JWRB / XKAPPA
-        XLOGLEV = LOG (XNLEV)
-
-        DO IJ = KIJS, KIJL
-          U10 (IJ) = XKAPPAD * US (IJ) * (XLOGLEV - LOG (Z0 (IJ)))
-          U10 (IJ) = MAX (U10 (IJ), WSPMIN)
-        ENDDO
-
-!$loki end remove
-      ELSE
-        WRITE (IU06, * ) ' ++++++++++++++++++++++++++++++++++++++++++'
-        WRITE (IU06, * ) ' + AIRSEA : INVALID VALUE OF ICODE_WND    +'
-        WRITE (IU06, * ) ' ICODE_WND = ', ICODE_WND
-        WRITE (IU06, * ) ' ++++++++++++++++++++++++++++++++++++++++++'
-        CALL ABORT1
-      ENDIF
-
+      SELECT CASE (IPHYS)
+      CASE(0,1)
+            IF ((.NOT.PRESENT(HALP)) .OR. (.NOT.PRESENT(RNFAC))) THEN
+                  WRITE (IU06, * ) ' ++++++++++++++++++++++++++++++++++++++++++'
+                  WRITE (IU06, * ) ' + AIRSEA : HALP/RNFAC REQUIRED FOR JAN   +'
+                  WRITE (IU06, * ) ' ++++++++++++++++++++++++++++++++++++++++++'
+                  CALL ABORT1
+            ENDIF
+            CALL AIRSEA_JAN (KIJS, KIJL, &
+&                              HALP, U10, U10DIR, TAUW, TAUWDIR, RNFAC,  &
+&                              US, Z0, Z0B, CHRNCK, ICODE_WND, IUSFG)
+      CASE(2) 
+            CALL AIRSEA_BYDRZ(KIJS, KIJL, &
+            &                 U10, U10DIR, TAUW, TAUWDIR,  &
+            &                 US, Z0, Z0B, CHRNCK, ICODE_WND, IUSFG)
+
+      END SELECT
+
       IF (LHOOK) CALL DR_HOOK ('AIRSEA', 1, ZHOOK_HANDLE)
 
       END SUBROUTINE AIRSEA
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,5 +16,6 @@ ecbundle @@
     *.DS_Store
     .vscode
     *.mod
+    x*.sh
     __pycache__/