Changeset 3669

Timestamp:

2012-11-26T16:08:48+01:00 (11 years ago)

Author:

pabouttier

Message:

Update cppkeys and namelist for ORCA2_TAM configuration - See Ticket #1027

Location:

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/CONFIG/ORCA2_TAM

Files:

• EXP00/namelist (modified) (6 diffs)
• cpp_ORCA2_TAM.fcm (modified) (1 diff)

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/CONFIG/ORCA2_TAM/EXP00/namelist

@@ -134 +134 @@
    ln_cpl      = .false.   !  Coupled formulation                       (T => fill namsbc_cpl )
    ln_apr_dyn  = .false.   !  Patm gradient added in ocean & ice Eqs.   (T => fill namsbc_apr )
-   nn_ice      = 2         !  =0 no ice boundary condition   ,
+   nn_ice      = 0         !  =0 no ice boundary condition   ,
                            !  =1 use observed ice-cover      ,
                            !  =2 ice-model used                         ("key_lim3" or "key_lim2)
@@ -140 +140 @@
    ln_rnf      = .true.    !  runoffs                                   (T => fill namsbc_rnf)
    ln_ssr      = .true.    !  Sea Surface Restoring on T and/or S       (T => fill namsbc_ssr)
-   nn_fwb      = 3         !  FreshWater Budget: =0 unchecked
+   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked
                            !     =1 global mean of e-p-r set to zero at each time step
                            !     =2 annual global mean of e-p-r set to zero
@@ -254 +254 @@
    ln_qsr_2bd  = .false.   !  2 bands              light penetration
    ln_qsr_bio  = .false.   !  bio-model light penetration
-   nn_chldta   =      1    !  RGB : Chl data (=1) or cst value (=0)
+   nn_chldta   =      0    !  RGB : Chl data (=1) or cst value (=0)
    rn_abs      =   0.58    !  RGB & 2 bands: fraction of light (rn_si1)
    rn_si0      =   0.35    !  RGB & 2 bands: shortess depth of extinction
@@ -752 +752 @@
 &namsol        !   elliptic solver / island / free surface
 !-----------------------------------------------------------------------
-   nn_solv     =      1    !  elliptic solver: =1 preconditioned conjugate gradient (pcg)
+   nn_solv     =      2    !  elliptic solver: =1 preconditioned conjugate gradient (pcg)
                            !                   =2 successive-over-relaxation (sor)
    nn_sol_arp  =      0    !  absolute/relative (0/1) precision convergence test
@@ -987 +987 @@
 !-----------------------------------------------------------------------
     cn_dirtrj   = 'tam_trajectory'   ! prefix for input/ouput files
-    ln_trjhand  = .false.            ! Handling non linear trajectory
+    ln_trjhand  = .true.            ! Handling non linear trajectory
     nn_ittrjfrq = 5                 ! Output/input frequency
     ln_trj_spl = .false.             ! Handling trajectory at simple precision
@@ -994 +994 @@
 &namtst_tam ! NEMOTAM driver ('key_tam')
 !-----------------------------------------------------------------------
-   ln_swi_opatam  = 2           ! Switch for different TAM modes
+   ln_swi_opatam  = 0           ! Switch for different TAM modes
                                 ! = 0 => Routine by routine adjoint test
                                 ! = 1 => Step adjoint test
+                                ! = 2 => Run LT model in stand-alone
 /
 !-----------------------------------------------------------------------

branches/2012/dev_r3604_LEGI8_TAM/NEMOGCM/CONFIG/ORCA2_TAM/cpp_ORCA2_TAM.fcm

@@ -1 @@
- bld::tool::fppkeys key_trabbl key_orca_r2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm  key_tam
+ bld::tool::fppkeys key_trabbl key_orca_r2 key_dynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_nosignedzero key_tam