Changeset 5774

Timestamp:

2015-10-02T11:39:50+02:00 (9 years ago)

Author:

cetlod

Message:

LDF-ADV, step II.2: phasing the improvements/simplifications of advective tracer trend: minor bug corrections

Location:

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM

Files:

• CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg (modified) (1 diff)
• NEMO/TOP_SRC/TRP/trcadv.F90 (modified) (1 diff)
• SETTE/param.cfg (modified) (2 diffs)

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist_cfg

@@ -144 +144 @@
 !-----------------------------------------------------------------------
    ln_traadv_fct =  .true.    !  FCT scheme
-      nn_fct_h   =  2               !  =2/4, horizontal 2nd / 4th order 
-      nn_fct_v   =  2               !  =2/4, vertical   2nd / COMPACT 4th order 
+      nn_fct_h   =  2               !  =2/4, horizontal 2nd / 4th order
+      nn_fct_v   =  2               !  =2/4, vertical   2nd / COMPACT 4th order
       nn_fct_zts =  0               !  >=1,  2nd order FCT scheme with vertical sub-timestepping
       !                             !        (number of sub-timestep = nn_fct_zts)
 /
 !-----------------------------------------------------------------------
-&namtra_ldf    !   lateral diffusion scheme for tracers 
-!-----------------------------------------------------------------------
-
+&namtra_ldf    !   lateral diffusion scheme for tracers
+!-----------------------------------------------------------------------
    rn_aht_0         =  1000.    !  horizontal eddy diffusivity for tracers [m2/s]
-   rn_aeiv_0        =     0.    !  eddy induced velocity coefficient [m2/s]    (require "key_traldf_eiv")
+/
+!----------------------------------------------------------------------------------
+&namtra_ldfeiv !   eddy induced velocity param.
+!----------------------------------------------------------------------------------
+   rn_aeiv_0     = 0.   ! eddy induced velocity coefficient   [m2/s]
 /
 !-----------------------------------------------------------------------

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90

@@ -204 +204 @@
       !
 
-      ioptio = 0                      ! Parameter control
-      IF( ln_trcadv_cen                      )   nadv = np_CEN
-      IF( ln_trcadv_fct                      )   nadv = np_FCT
-      IF( ln_trcadv_fct .AND. nn_fct_zts > 0 )   nadv = np_FCT_zts
-      IF( ln_trcadv_mus                      )   nadv = np_MUS
-      IF( ln_trcadv_ubs                      )   nadv = np_UBS
-      IF( ln_trcadv_qck                      )   nadv = np_QCK
+      ioptio = 0                       !==  Parameter control  ==!
+      IF( ln_trcadv_cen )   ioptio = ioptio + 1
+      IF( ln_trcadv_fct )   ioptio = ioptio + 1
+      IF( ln_trcadv_mus )   ioptio = ioptio + 1
+      IF( ln_trcadv_ubs )   ioptio = ioptio + 1
+      IF( ln_trcadv_qck )   ioptio = ioptio + 1
+
       !
       IF( ioptio == 0 ) THEN

branches/2015/dev_r5721_CNRS9_NOC3_LDF/NEMOGCM/SETTE/param.cfg

@@ -1 +1 @@
 #- forcing files storing
-FORCING_DIR=~/FORCING
+FORCING_DIR=/workgpfs/rech/omr/romr006/FORCING
 #- input files storing
 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
@@ -6 +6 @@
 #TMPDIR=${CONFIG_DIR}/${NEW_CONF}/EXP00
 #- VALIDATION files storing
-NEMO_VALIDATION_DIR=~/NEMO_VALIDATION
+NEMO_VALIDATION_DIR=/workgpfs/rech/omr/romr006/NEMO_VALIDATION