Changeset 14016 for NEMO/branches/2020/tickets_icb_1900/src/OCE/SBC/sbcblk.F90

Timestamp:

2020-12-02T16:28:39+01:00 (3 years ago)

Author:

mathiot

Message:

ticket 1900: upgrade to trunk@r14015 (head trunk at 16h27)

Location:

NEMO/branches/2020/tickets_icb_1900

Files:

• . (modified) (1 prop)
• src/OCE/SBC/sbcblk.F90 (modified) (1 diff)

NEMO/branches/2020/tickets_icb_1900

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette_MPI3_LoopFusion@13943         sette
+^/utils/CI/sette_wave@13990         sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette_MPI3_LoopFusion@13943         sette
+^/utils/CI/sette_wave@13990         sette

NEMO/branches/2020/tickets_icb_1900/src/OCE/SBC/sbcblk.F90

@@ -314 +314 @@
          ENDIF
       END DO
-      !
-      IF( ln_wave ) THEN
-         !Activated wave module but neither drag nor stokes drift activated
-         IF( .NOT.(ln_cdgw .OR. ln_sdw .OR. ln_tauwoc .OR. ln_stcor ) )   THEN
-            CALL ctl_stop( 'STOP',  'Ask for wave coupling but ln_cdgw=F, ln_sdw=F, ln_tauwoc=F, ln_stcor=F' )
-            !drag coefficient read from wave model definable only with mfs bulk formulae and core
-         ELSEIF(ln_cdgw .AND. .NOT. ln_NCAR )       THEN
-            CALL ctl_stop( 'drag coefficient read from wave model definable only with NCAR and CORE bulk formulae')
-         ELSEIF(ln_stcor .AND. .NOT. ln_sdw)                             THEN
-            CALL ctl_stop( 'Stokes-Coriolis term calculated only if activated Stokes Drift ln_sdw=T')
-         ENDIF
-      ELSE
-         IF( ln_cdgw .OR. ln_sdw .OR. ln_tauwoc .OR. ln_stcor )                &
-            &   CALL ctl_stop( 'Not Activated Wave Module (ln_wave=F) but asked coupling ',    &
-            &                  'with drag coefficient (ln_cdgw =T) '  ,                        &
-            &                  'or Stokes Drift (ln_sdw=T) ' ,                                 &
-            &                  'or ocean stress modification due to waves (ln_tauwoc=T) ',      &
-            &                  'or Stokes-Coriolis term (ln_stcori=T)'  )
-      ENDIF
       !
       IF( ln_abl ) THEN       ! ABL: read 3D fields for wind, temperature, humidity and pressure gradient

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette_MPI3_LoopFusion@13943         sette
+^/utils/CI/sette_wave@13990         sette