Changeset 7221 for branches/2015

Timestamp:

2016-11-14T08:41:51+01:00 (7 years ago)

Author:

emanuelaclementi

Message:

#1643 Bug fix in development branch 2015/dev_r5936_INGV1_WAVE

Location:

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (2 diffs)
• NEMO/OPA_SRC/DYN/dynstcor.F90 (modified) (1 diff)
• NEMO/OPA_SRC/SBC/sbcblk_core.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbcmod.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/step.F90 (modified) (3 diffs)

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -250 +250 @@
                            !     =1 global mean of e-p-r set to zero at each time step
                            !     =2 annual global mean of e-p-r set to zero
-   ln_wave = .false.       !  Activate coupling with wave (either Stokes Drift or Drag coefficient, or both)  (T => fill namsbc_wave)
-   ln_cdgw = .false.       !  Neutral drag coefficient read from wave model (T => fill namsbc_wave)
-   ln_sdw  = .false.       !  Computation of 3D stokes drift                (T => fill namsbc_wave)
-   ln_tauoc= .false.       !  Activate ocean stress modified by external wave induced stress (T => fill namsbc_wave)
-   ln_stcor= .false.       !  Activate Stokes Coriolis term (T => fill namsbc_wave)
+   ln_wave = .false.       !  Activate coupling with wave  (T => fill namsbc_wave)
+   ln_cdgw = .false.       !  Neutral drag coefficient read from wave model (T => ln_wave=.true. & fill namsbc_wave)
+   ln_sdw  = .false.       !  Read 2D Surf Stokes Drift & Computation of 3D stokes drift (T => ln_wave=.true. & fill namsbc_wave) 
+   ln_tauoc= .false.       !  Activate ocean stress modified by external wave induced stress (T => ln_wave=.true. & fill namsbc_wave)
+   ln_stcor= .false.       !  Activate Stokes Coriolis term (T => ln_wave=.true. & ln_sdw=.true. & fill namsbc_wave)
    nn_lsm  = 0             !  =0 land/sea mask for input fields is not applied (keep empty land/sea mask filename field) ,
                            !  =1:n number of iterations of land/sea mask application for input fields (fill land/sea mask filename field)
@@ -917 +917 @@
    ln_zdfexp   = .false.   !  time-stepping: split-explicit (T) or implicit (F) time stepping
    nn_zdfexp   =    3            !  number of sub-timestep for ln_zdfexp=T
-   ln_zdfqiao  = .false.   !  Enhanced wave vertical mixing Qiao (2010)
+   ln_zdfqiao  = .false.   !  Enhanced wave vertical mixing Qiao (2010) (T => ln_wave=.true. & ln_sdw=.true. & fill namsbc_wave)
 /
 !-----------------------------------------------------------------------

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/DYN/dynstcor.F90

@@ -77 +77 @@
       ENDDO
       !
-      IF( nn_timing == 1 )  CALL timing_stop('dynst_cor')
+      IF( nn_timing == 1 )  CALL timing_stop('dyn_stcor')
       !
    END SUBROUTINE dyn_stcor

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_core.F90

@@ -737 +737 @@
 
       !! Neutral coefficients at 10m:
-      IF( ln_cdgw ) THEN      ! wave drag case
+      IF( ln_wave .AND. ln_cdgw ) THEN      ! wave drag case
          cdn_wave(:,:) = cdn_wave(:,:) + rsmall * ( 1._wp - tmask(:,:,1) )
          ztmp0   (:,:) = cdn_wave(:,:)
@@ -783 +783 @@
          END IF
        
-         IF( ln_cdgw ) THEN      ! surface wave case
+         IF( ln_wave .AND. ln_cdgw ) THEN      ! surface wave case
             sqrt_Cd = vkarmn / ( vkarmn / sqrt_Cd_n10 - zpsi_m_u ) 
             Cd      = sqrt_Cd * sqrt_Cd

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -216 +216 @@
       IF ( ln_wave ) THEN
       !Activated wave module but neither drag nor stokes drift activated
-         IF ( .NOT.(ln_cdgw .OR. ln_sdw) )   THEN
-            CALL ctl_warn( 'Ask for wave coupling but nor drag coefficient (ln_cdgw=F) neither stokes drift activated (ln_sdw=F)' )
+         IF ( .NOT.(ln_cdgw .OR. ln_sdw .OR. ln_tauoc .OR. ln_stcor ) )   THEN
+            CALL ctl_warn( 'Ask for wave coupling but ln_cdgw=F, ln_sdw=F, ln_tauoc=F, ln_stcor=F')
       !drag coefficient read from wave model definable only with mfs bulk formulae and core 
          ELSEIF (ln_cdgw .AND. .NOT.(ln_blk_mfs .OR. ln_blk_core) )       THEN       
              CALL ctl_stop( 'drag coefficient read from wave model definable only with mfs bulk formulae and core')
+         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  )                                                           & 
+      IF ( ln_cdgw .OR. ln_sdw .OR. ln_tauoc .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) ')
+         &                  'with drag coefficient (ln_cdgw =T) '  ,                        &
+         &                  'or Stokes Drift (ln_sdw=T) ' ,                                 &
+         &                  'or ocean stress modification due to waves (ln_tauoc=T) ',      &  
+         &                  'or Stokes-Coriolis term (ln_stcori=T)'  )
       ENDIF 
       !                          ! Choice of the Surface Boudary Condition (set nsbc)
@@ -360 +365 @@
                              CALL sbc_cpl_rcv ( kt, nn_fsbc, nn_ice )   ! OPA-SAS coupling: OPA receiving fields from SAS
       END SELECT
-      IF (ln_wave .AND. ln_tauoc) THEN
+      IF ( ln_wave .AND. ln_tauoc) THEN                                 ! Wave stress subctracted
             utau(:,:) = utau(:,:)*tauoc_wave(:,:)
             vtau(:,:) = vtau(:,:)*tauoc_wave(:,:)

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -134 +134 @@
       IF( lk_zdfgls  )   CALL zdf_gls( kstp )            ! GLS closure scheme for Kz
       IF( ln_zdfqiao )   THEN
+      !Activated Qiao enhanced turbulence but neither ln_wave or ln_sdw are activated
+       IF ( .NOT.( ln_wave .AND. ln_sdw ) )   THEN
+        CALL ctl_stop ( 'Ask for wave Qiao enhanced turbulence but ln_wave and ln_sdw have to be activated')
+       ELSE
         CALL zdf_qiao(kstp )                             ! Qiao vertical mixing 
          DO jk = 1, jpkm1
@@ -144 +148 @@
           END DO
          END DO
+       ENDIF 
       ENDIF
       !
@@ -232 +237 @@
                          CALL dyn_vor       ( kstp )  ! vorticity term including Coriolis
                          CALL dyn_ldf       ( kstp )  ! lateral mixing
-      IF( ln_stcor    )  CALL dyn_stcor     ( kstp )  ! Stokes-Coriolis forcing
+      IF( ln_wave .AND. ln_sdw .AND. ln_stcor)           & 
+               &         CALL dyn_stcor     ( kstp )  ! Stokes-Coriolis forcing
                          CALL dyn_hpg       ( kstp )  ! horizontal gradient of Hydrostatic pressure
                          CALL dyn_spg       ( kstp )  ! surface pressure gradient