Changeset 6736 for branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF

Timestamp:

2016-06-24T09:50:27+02:00 (8 years ago)

Author:

jamesharle

Message:

FASTNEt code modifications

Location:

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF

Files:

• ldfdyn.F90 (modified) (3 diffs)
• ldfdyn_oce.F90 (modified) (1 diff)
• ldftra.F90 (modified) (2 diffs)
• ldftra_c3d.h90 (modified) (2 diffs)
• ldftra_oce.F90 (modified) (1 diff)

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn.F90

@@ -67 +67 @@
       NAMELIST/namdyn_ldf/ ln_dynldf_lap  , ln_dynldf_bilap,                  &
          &                 ln_dynldf_level, ln_dynldf_hor  , ln_dynldf_iso,   &
-         &                 rn_ahm_0_lap   , rn_ahmb_0      , rn_ahm_0_blp ,   &
-         &                 rn_cmsmag_1    , rn_cmsmag_2    , rn_cmsh,         &
-         &                 rn_ahm_m_lap   , rn_ahm_m_blp
-
-   !!----------------------------------------------------------------------
+         &                 rn_ahm_0_lap   , rn_ahmb_0      , rn_ahm_0_blp
+      !!----------------------------------------------------------------------
 
       REWIND( numnam )                  ! Read Namelist namdyn_ldf : Lateral physics
@@ -89 +86 @@
          WRITE(numout,*) '      background viscosity                    rn_ahmb_0       = ', rn_ahmb_0
          WRITE(numout,*) '      horizontal bilaplacian eddy viscosity   rn_ahm_0_blp    = ', rn_ahm_0_blp
-         WRITE(numout,*) '      upper limit for laplacian eddy visc     rn_ahm_m_lap    = ', rn_ahm_m_lap
-         WRITE(numout,*) '      upper limit for bilap eddy viscosity    rn_ahm_m_blp    = ', rn_ahm_m_blp
-
       ENDIF
 
@@ -148 +142 @@
       IF(lwp) WRITE(numout,*) '        ahm1 = ahm2 = ahm0 =  ',ahm0
 #endif
-     nkahm_smag = 0
-#if defined key_dynldf_smag
-     nkahm_smag = 1
-#endif
-
       !
    END SUBROUTINE ldf_dyn_init

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF/ldfdyn_oce.F90

@@ -23 +23 @@
    REAL(wp), PUBLIC ::   rn_ahm_0_blp    =     0._wp   !: lateral bilaplacian eddy viscosity (m4/s)
    REAL(wp), PUBLIC ::   ahm0, ahmb0, ahm0_blp         !: OLD namelist names
-   REAL(wp), PUBLIC ::   rn_cmsmag_1     =     3._wp   !: constant in laplacian Smagorinsky viscosity
-   REAL(wp), PUBLIC ::   rn_cmsmag_2     =     3._wp   !: constant in bilaplacian Smagorinsky viscosity
-   REAL(wp), PUBLIC ::   rn_cmsh         =     1._wp   !: 1 or 0 , if 0 -use only shear for Smagorinsky viscosity
-   REAL(wp), PUBLIC ::   rn_ahm_m_blp    = -1.e12_wp   !: upper limit for bilap  abs(ahm) < min( dx^4/128rdt, rn_ahm_m_blp)
-   REAL(wp), PUBLIC ::   rn_ahm_m_lap    =  40000_wp   !: upper limit for lap  ahm < min(dx^2/16rdt, rn_ahm_m_lap)
-   INTEGER , PUBLIC ::   nkahm_smag      =  0          !: 
 
    !                                                                                  !!! eddy coeff. at U-,V-,W-pts [m2/s]

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90

@@ -66 +66 @@
       NAMELIST/namtra_ldf/ ln_traldf_lap  , ln_traldf_bilap,                  &
          &                 ln_traldf_level, ln_traldf_hor  , ln_traldf_iso,   &
-         &                 ln_traldf_grif , ln_traldf_gdia ,                  &
-         &                 ln_triad_iso   , ln_botmix_grif ,                  &
+         &                 ln_traldf_grif , ln_traldf_gdia,                   &
+         &                 ln_triad_iso   , ln_botmix_grif,                   &
          &                 rn_aht_0       , rn_ahtb_0      , rn_aeiv_0,       &
-         &                 rn_slpmax      , rn_chsmag      ,    rn_smsh,      &
-         &                 rn_aht_m
+         &                 rn_slpmax
       !!----------------------------------------------------------------------
 
@@ -154 +153 @@
       IF(lwp)WRITE(numout,*) '      constant eddy diffusivity coef.   ahtu = ahtv = ahtw = aht0 = ', aht0
       IF( lk_traldf_eiv ) THEN
+         IF(lwp)WRITE(numout,*)
          IF(lwp)WRITE(numout,*) '      constant eddy induced velocity coef.   aeiu = aeiv = aeiw = aeiv0 = ', aeiv0
-      
       ENDIF
 #endif
-
-#if defined key_traldf_smag && ! defined key_traldf_c3d
-        CALL ctl_stop( 'key_traldf_smag can only be used with key_traldf_c3d' )
-#endif
-#if defined key_traldf_smag
-        IF(lwp) WRITE(numout,*)' SMAGORINSKY DIFFUSION'
-        IF(lwp .AND. rn_smsh < 1)  WRITE(numout,*)' only  shear is used '
-        IF(lwp.and.ln_traldf_bilap) CALL ctl_stop(' SMAGORINSKY + BILAPLACIAN - UNSTABLE OR NON_CONSERVATIVE' )
-#endif
-
       !
    END SUBROUTINE ldf_tra_init

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_c3d.h90

@@ -108 +108 @@
       CALL lbc_lnk( aeiv, 'V', 1. )
       CALL lbc_lnk( aeiw, 'W', 1. )
+!!!!!# endif jdha
+
       IF(lwp .AND. ld_print ) THEN
          WRITE(numout,*)
@@ -119 +121 @@
          CALL prihre(aeiw(:,:,1),jpi,jpj,1,jpi,1,1,jpj,1,1.e-3,numout)
       ENDIF
-
-# endif
+# endif jdha
+      !
    END SUBROUTINE ldf_tra_c3d

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90

@@ -30 +30 @@
    REAL(wp), PUBLIC ::   rn_aeiv_0       = 2000._wp  !: eddy induced velocity coefficient (m2/s)
    REAL(wp), PUBLIC ::   rn_slpmax       = 0.01_wp   !: slope limit
-   REAL(wp), PUBLIC ::   rn_chsmag       = 1._wp     !:  multiplicative factor in Smagorinsky diffusivity
-   REAL(wp), PUBLIC ::   rn_smsh         = 1._wp     !:  Smagorinsky diffusivity: = 0 - use only sheer
-   REAL(wp), PUBLIC ::   rn_aht_m        = 2000._wp  !:  upper limit or stability criteria for lateral eddy diffusivity (m2/s)
 
    REAL(wp), PUBLIC ::   aht0, ahtb0, aeiv0         !!: OLD namelist names
-
    LOGICAL , PUBLIC ::   ln_triad_iso    = .FALSE.   !: calculate triads twice
    LOGICAL , PUBLIC ::   ln_botmix_grif  = .FALSE.   !: mixing on bottom