Changeset 14953 for NEMO/branches/2021

Timestamp:

2021-06-04T17:51:36+02:00 (3 years ago)

Author:

amoulin

Message:

read wnum in sbcwave.F90 of MY_SRC -ticket #2613

File:

• NEMO/branches/2021/dev_r14886_VLD-03_Aimie_Moulin_Wave_Coupling_TestCase/tests/ADIAB_WAVE/MY_SRC/sbcwave.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14886_VLD-03_Aimie_Moulin_Wave_Coupling_TestCase/tests/ADIAB_WAVE/MY_SRC/sbcwave.F90

@@ -24 +24 @@
    USE bdy_oce        ! open boundary condition variables
    USE domvvl         ! domain: variable volume layers
-   USE zdf_oce,  ONLY : ln_zdfswm
    USE usrdef_nam , ONLY: ln_STOKES_ADIAB   
    !
@@ -325 +324 @@
 
       ! Read also wave number if needed, so that it is available in coupling routines
-      IF( ln_zdfswm .OR. ln_STOKES_ADIAB .AND. .NOT. cpl_wnum ) THEN     !==wavenumber==!
+      IF( ln_STOKES_ADIAB .AND. .NOT. cpl_wnum ) THEN     !==wavenumber==!
          CALL fld_read( kt, nn_fsbc, sf_wn )             ! read wave parameters from external forcing
          wnum(:,:) = sf_wn(1)%fnow(:,:,1) * tmask(:,:,1)
@@ -503 +502 @@
          ENDIF
 
-         IF( ln_zdfswm .OR. ln_STOKES_ADIAB ) THEN         ! Wave number (only needed for Qiao parametrisation,ln_zdfswm=T)
-            IF( .NOT. cpl_wnum ) THEN
-               ALLOCATE( sf_wn(1), STAT=ierror )           !* allocate and fill sf_wave with sn_wnum
-               IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_wave_init: unable to allocate sf_wn structure' )
-                                      ALLOCATE( sf_wn(1)%fnow(jpi,jpj,1)   )
-               IF( sn_wnum%ln_tint )  ALLOCATE( sf_wn(1)%fdta(jpi,jpj,1,2) )
-               CALL fld_fill( sf_wn, (/ sn_wnum /), cn_dir, 'sbc_wave', 'Wave module', 'namsbc_wave' )
-            ENDIF
-         ENDIF
-
          IF( ln_sdw ) THEN                      ! Stokes drift
             ! 1. Find out how many fields have to be read from file if not coupled
@@ -551 +540 @@
                sf_sd(jp_usd)%zsgn = -1._wp   ;  sf_sd(jp_vsd)%zsgn = -1._wp   ! vector field at T point: overwrite default definition of zsgn
             ENDIF
+                       !
+            ! 3. Wave number (only needed for Qiao parametrisation,
+            ! ln_zdfqiao=T)
+            IF( ln_STOKES_ADIAB ) THEN
+             IF( .NOT. cpl_wnum ) THEN
+                ALLOCATE( sf_wn(1), STAT=ierror )           !* allocate and fill sf_wave with sn_wnum
+                IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_wave_init: unable to allocate sf_wn structure' )
+                                       ALLOCATE( sf_wn(1)%fnow(jpi,jpj,1)   )
+                IF( sn_wnum%ln_tint )  ALLOCATE( sf_wn(1)%fdta(jpi,jpj,1,2) )
+                CALL fld_fill( sf_wn, (/ sn_wnum /), cn_dir, 'sbc_wave', 'Wave module', 'namsbc_wave' )
+             ENDIF
+            ENDIF
+            !
             !
          ENDIF