Changeset 4159

Timestamp:

2013-11-06T19:28:13+01:00 (11 years ago)

Author:

cetlod

Message:

dev_LOCEAN_2013: minor corrections

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM

Files:

• CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top_cfg (modified) (1 diff)
• CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg (modified) (2 diffs)
• CONFIG/SHARED/namelist_top_ref (modified) (1 diff)
• CONFIG/cfg.txt (modified) (1 diff)
• NEMO/OFF_SRC/domain.F90 (modified) (1 diff)
• NEMO/TOP_SRC/trcnam.F90 (modified) (1 diff)

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/namelist_top_cfg

@@ -10 +10 @@
 &namtrc     !   tracers definition
 !-----------------------------------------------------------------------
-   ln_top_euler  = .true.   !  use Euler time-stepping for TOP
 !                !    name   !           title of the field              ! initial data ! initial data ! save   !
 !                !           !                                           !  units       ! from file    ! or not ! 

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist_top_cfg

@@ -5 +5 @@
 &namtrc_run     !   run information
 !-----------------------------------------------------------------------
+   nn_writetrc   =  1460     !  time step frequency for sn_tracer outputs
    ln_top_euler  = .true.    !  use Euler time-stepping for TOP
 /
@@ -10 +11 @@
 &namtrc     !   tracers definition
 !-----------------------------------------------------------------------
-   ln_top_euler  = .true.   !  use Euler time-stepping for TOP
-   nn_writetrc   =  1460     !  time step frequency for sn_tracer outputs
 !
 !              !    name   !           title of the field              !   units    ! initial data ! save   !

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/SHARED/namelist_top_ref

@@ -28 +28 @@
    ln_trcdta     =   .true.  !  Initialisation from data input file (T) or not (F)
    ln_trcdmp     =  .false.  !  add a damping termn (T) or not (F)
+   ln_trcdmp_clo =  .false.  !  damping term (T) or not (F) on closed seas
 /
 !-----------------------------------------------------------------------

branches/2013/dev_LOCEAN_2013/NEMOGCM/CONFIG/cfg.txt

@@ -5 +5 @@
 ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC
 ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
+GYRE_PISCES OPA_SRC TOP_SRC
+ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC
-ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC
-GYRE_PISCES OPA_SRC TOP_SRC

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OFF_SRC/domain.F90

@@ -94 +94 @@
       NAMELIST/namdom/ nn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh    , rn_hmin,   &
          &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,            &
-         &             rn_rdtmax, rn_rdth     , nn_baro     , nn_closea , &
+         &             rn_rdtmax, rn_rdth     , nn_baro     , nn_closea , ln_crs, &
          &             jphgr_msh, &
          &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m, &

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/TOP_SRC/trcnam.F90

@@ -203 +203 @@
       IF(lwp) THEN                   ! control print
          WRITE(numout,*)
-         WRITE(numout,*) ' Namelist : namtrc'
+         WRITE(numout,*) ' Namelist : namtrc_run'
          WRITE(numout,*) '   time step freq. for passive tracer           nn_dttrc      = ', nn_dttrc
          WRITE(numout,*) '   restart  for passive tracer                  ln_rsttr      = ', ln_rsttr
          WRITE(numout,*) '   control of time step for passive tracer      nn_rsttr      = ', nn_rsttr
          WRITE(numout,*) '   first time step for pass. trac.              nittrc000     = ', nittrc000
-         WRITE(numout,*) '   frequency of outputs for passive tracers     nn_writetrc   = ', nn_writetrc  
+         WRITE(numout,*) '   frequency of outputs for passive tracers     nn_writetrc   = ', nn_writetrc 
+         WRITE(numout,*) '   Use euler integration for TRC (y/n)          ln_top_euler  = ', ln_top_euler
          WRITE(numout,*) ' '
       ENDIF