Changeset 4742

Timestamp:

2014-08-14T11:05:30+02:00 (10 years ago)

Author:

rfurner

Message:

turning of vertical mixing etc

Location:

branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC

Files:

• ZDF/zdfini.F90 (modified) (2 diffs)
• step.F90 (modified) (3 diffs)

branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfini.F90

@@ -115 +115 @@
          ioptio = ioptio+1
       ENDIF
-      IF( ioptio == 0 .OR. ioptio > 1 .AND. .NOT. lk_esopa )   &
-         &   CALL ctl_stop( ' one and only one vertical diffusion option has to be defined ' )
+      IF( ioptio > 1 .AND. .NOT. lk_esopa )   &
+         &   CALL ctl_stop( 'only one vertical diffusion option has to be defined ' )
+      IF( ioptio == 0 .AND. .NOT. ( lk_esopa .OR. lk_surge ) )   &
+         &   CALL ctl_stop( 'a vertical diffusion option has to be defined ' )
       !
       !                               ! ... Convection
@@ -144 +146 @@
       ENDIF
       IF ( ioptio > 1 .AND. .NOT. lk_esopa )   CALL ctl_stop( ' chose between ln_zdfnpc and ln_zdfevd' )
-      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp ) )           &
-         CALL ctl_stop( ' except for TKE, GLS or KPP physics, a convection scheme is',   &
+      IF( ioptio == 0 .AND. .NOT.( lk_zdftke .OR. lk_zdfgls .OR. lk_zdfkpp .OR. lk_surge ) )           &
+         CALL ctl_stop( ' except for TKE, GLS or KPP physics (or running in surge mode), a convection scheme is',   &
          &              ' required: ln_zdfevd or ln_zdfnpc logicals' )
 

branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -187 +187 @@
           IF(.NOT. Agrif_Root())  CALL Agrif_Sponge_dyn        ! momentum sponge
 #endif
-                                  CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
+!                                  CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
                                   CALL dyn_spg( kstp, indic )  ! surface pressure gradient
 
@@ -273 +273 @@
 
                                CALL dyn_bfr( kstp )         ! bottom friction
+#if ! defined key_surge
                                CALL dyn_zdf( kstp )         ! vertical diffusion
+#endif
       ELSE
                                ua(:,:,:) = 0.e0             ! set dynamics trends to zero
@@ -290 +292 @@
         IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_dyn        ! momemtum sponge
 #endif
-                               CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
+!                               CALL dyn_hpg( kstp )         ! horizontal gradient of Hydrostatic pressure
                                CALL dyn_bfr( kstp )         ! bottom friction
+#if ! defined key_surge
                                CALL dyn_zdf( kstp )         ! vertical diffusion
+#endif
                                CALL dyn_spg( kstp, indic )  ! surface pressure gradient
       ENDIF