Changeset 13798 for NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif/tests/ISOMIP

Timestamp:

2020-11-16T11:20:33+01:00 (4 years ago)

Author:

cetlod

Message:

dev_r13333_TOP-05_Ethe_Agrif : phasing with trunk at revision r13787

Location:

NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif

Files:

• . (modified) (1 prop)
• tests/ISOMIP/EXPREF/context_nemo.xml (modified) (1 diff)
• tests/ISOMIP/EXPREF/namelist_cfg (modified) (6 diffs)

NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13292        sette
+^/utils/CI/sette@13559        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13292        sette
+^/utils/CI/sette@13559        sette

NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif/tests/ISOMIP/EXPREF/context_nemo.xml

@@ -11 +11 @@
        <variable id="ref_month" type="int"> 01 </variable>
        <variable id="ref_day"   type="int"> 01 </variable>
-       <variable id="rau0"      type="float" > 1026.0 </variable>
+       <variable id="rho0"      type="float" > 1026.0 </variable>
        <variable id="cpocean"   type="float" > 3991.86795711963 </variable>
        <variable id="convSpsu"  type="float" > 0.99530670233846  </variable>

NEMO/branches/2020/dev_r13333_TOP-05_Ethe_Agrif/tests/ISOMIP/EXPREF/namelist_cfg

@@ -227 +227 @@
 !!                                                                    !!
 !!   namdrg        top/bottom drag coefficient                          (default: NO selection)
-!!   namdrg_top    top    friction                                      (ln_OFF=F & ln_isfcav=T)
-!!   namdrg_bot    bottom friction                                      (ln_OFF=F)
+!!   namdrg_top    top    friction                                      (ln_drg_OFF=F & ln_isfcav=T)
+!!   namdrg_bot    bottom friction                                      (ln_drg_OFF=F)
 !!   nambbc        bottom temperature boundary condition                (default: OFF)
 !!   nambbl        bottom boundary layer scheme                         (default: OFF)
@@ -236 +236 @@
 &namdrg        !   top/bottom drag coefficient                          (default: NO selection)
 !-----------------------------------------------------------------------
-   ln_OFF     = .false.    !  free-slip       : Cd = 0                  (F => fill namdrg_bot
+   ln_drg_OFF = .false.   !  free-slip       : Cd = 0                  (F => fill namdrg_bot
    ln_lin     = .false.    !      linear  drag: Cd = Cd0 Uc0                   &   namdrg_top)
    ln_non_lin = .true.     !  non-linear  drag: Cd = Cd0 |U|
@@ -244 +244 @@
 /
 !-----------------------------------------------------------------------
-&namdrg_top    !   TOP friction                                         (ln_OFF =F & ln_isfcav=T)
+&namdrg_top    !   TOP friction                                         (ln_drg_OFF =F & ln_isfcav=T)
 !-----------------------------------------------------------------------
    rn_Cd0     =  2.5e-3    !  drag coefficient [-]
@@ -255 +255 @@
 /
 !-----------------------------------------------------------------------
-&namdrg_bot    !   BOTTOM friction                                      (ln_OFF =F)
+&namdrg_bot    !   BOTTOM friction                                      (ln_drg_OFF =F)
 !-----------------------------------------------------------------------
    rn_Cd0     =  1.e-3    !  drag coefficient [-]
@@ -423 +423 @@
 !!                                                                    !!
 !!   namtrd       dynamics and/or tracer trends                         (default: OFF)
-!!   namptr       Poleward Transport Diagnostics                        (default: OFF)
 !!   namhsb       Heat and salt budgets                                 (default: OFF)
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)
@@ -438 +437 @@
 /
 !-----------------------------------------------------------------------
-&namptr        !   Poleward Transport Diagnostic                        (default: OFF)
-!-----------------------------------------------------------------------
-/
-!-----------------------------------------------------------------------
 &namhsb        !  Heat and salt budgets                                 (default: OFF)
 !-----------------------------------------------------------------------

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13292        sette
+^/utils/CI/sette@13559        sette