Changeset 9490 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

Timestamp:

2018-04-23T10:44:07+02:00 (6 years ago)

Author:

gm

Message:

#2075 - dev_merge_2017: scale-aware setting of lateral viscous and diffusive coefficient

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90 (modified) (9 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DOM/dtatsd.F90

@@ -9 +9 @@
    !!   NEMO     1.0  ! 2002-06  (G. Madec)  F90: Free form and module 
    !!            3.3  ! 2010-10  (C. Bricaud, S. Masson)  use of fldread
-   !!            3.4  ! 2010-11  (G. Madec, C. Ethe) Merge of dtatem and dtasal + suppression of CPP keys
+   !!            3.4  ! 2010-11  (G. Madec, C. Ethe) Merge of dtatem and dtasal + remove CPP keys
    !!----------------------------------------------------------------------
 
@@ -29 +29 @@
    PUBLIC   dta_tsd        ! called by istate.F90 and tradmp.90
 
-   LOGICAL , PUBLIC ::   ln_tsd_init      !: T & S data flag
-   LOGICAL , PUBLIC ::   ln_tsd_tradmp    !: internal damping toward input data flag
+   !                                  !!* namtsd  namelist : Temperature & Salinity Data *
+   LOGICAL , PUBLIC ::   ln_tsd_init   !: T & S data flag
+   LOGICAL , PUBLIC ::   ln_tsd_dmp    !: internal damping toward input data flag
 
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tsd   ! structure of input SST (file informations, fields read)
@@ -58 +59 @@
       TYPE(FLD_N)                   ::   sn_tem, sn_sal
       !!
-      NAMELIST/namtsd/   ln_tsd_init, ln_tsd_tradmp, cn_dir, sn_tem, sn_sal
+      NAMELIST/namtsd/   ln_tsd_init, ln_tsd_dmp, cn_dir, sn_tem, sn_sal
       !!----------------------------------------------------------------------
       !
@@ -72 +73 @@
       IF(lwm) WRITE ( numond, namtsd )
 
-      IF( PRESENT( ld_tradmp ) )   ln_tsd_tradmp = .TRUE.     ! forces the initialization when tradmp is used
+      IF( PRESENT( ld_tradmp ) )   ln_tsd_dmp = .TRUE.     ! forces the initialization when tradmp is used
       
       IF(lwp) THEN                  ! control print
@@ -79 +80 @@
          WRITE(numout,*) '~~~~~~~~~~~~ '
          WRITE(numout,*) '   Namelist namtsd'
-         WRITE(numout,*) '      Initialisation of ocean T & S with T &S input data   ln_tsd_init   = ', ln_tsd_init
-         WRITE(numout,*) '      damping of ocean T & S toward T &S input data        ln_tsd_tradmp = ', ln_tsd_tradmp
+         WRITE(numout,*) '      Initialisation of ocean T & S with T &S input data   ln_tsd_init = ', ln_tsd_init
+         WRITE(numout,*) '      damping of ocean T & S toward T &S input data        ln_tsd_dmp  = ', ln_tsd_dmp
          WRITE(numout,*)
-         IF( .NOT.ln_tsd_init .AND. .NOT.ln_tsd_tradmp ) THEN
+         IF( .NOT.ln_tsd_init .AND. .NOT.ln_tsd_dmp ) THEN
             WRITE(numout,*)
-            WRITE(numout,*) '   T & S data not used'
+            WRITE(numout,*) '   ===>>   T & S data not used'
          ENDIF
       ENDIF
@@ -95 +96 @@
       !
       !                             ! allocate the arrays (if necessary)
-      IF(  ln_tsd_init .OR. ln_tsd_tradmp  ) THEN
+      IF( ln_tsd_init .OR. ln_tsd_dmp ) THEN
          !
          ALLOCATE( sf_tsd(jpts), STAT=ierr0 )
@@ -129 +130 @@
       !!              - 'key_orca_lev10' interpolates on 10 times more levels
       !!              - s- or mixed z-s coordinate: vertical interpolation on model mesh
-      !!              - ln_tsd_tradmp=F: deallocates the T-S data structure
+      !!              - ln_tsd_dmp=F: deallocates the T-S data structure
       !!                as T-S data are no are used
       !!
@@ -149 +150 @@
       !
       !                                   !==   ORCA_R2 configuration and T & S damping   ==! 
-      IF( cn_cfg == "orca" .AND. nn_cfg == 2 .AND. ln_tsd_tradmp ) THEN    ! some hand made alterations
+      IF( cn_cfg == "orca" .AND. nn_cfg == 2 .AND. ln_tsd_dmp ) THEN    ! some hand made alterations
          !
          ij0 = 101   ;   ij1 = 109                       ! Reduced T & S in the Alboran Sea
@@ -238 +239 @@
       ENDIF
       !
-      IF( .NOT.ln_tsd_tradmp ) THEN                   !==   deallocate T & S structure   ==! 
+      IF( .NOT.ln_tsd_dmp ) THEN                   !==   deallocate T & S structure   ==! 
          !                                              (data used only for initialisation)
          IF(lwp) WRITE(numout,*) 'dta_tsd: deallocte T & S arrays as they are only use to initialize the run'