Changeset 12184 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref

Timestamp:

2019-12-11T14:35:26+01:00 (4 years ago)

Author:

smueller

Message:

Merging of the developments in ^{/NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis@12122 with respect to} /NEMO/trunk@12072 into ^{/NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (tickets #2175 and #2194)}

Location:

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019

Files:

• . (modified) (1 prop)
• cfgs/SHARED/namelist_ref (modified) (5 diffs)

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
+^/utils/tools_dev_r11751_ENHANCE-05_SimonM-Harmonic_Analysis@HEAD tools
 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
+^/utils/tools_dev_r11751_ENHANCE-05_SimonM-Harmonic_Analysis@HEAD tools
 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM

NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref

@@ -646 +646 @@
 !-----------------------------------------------------------------------
    ln_tide     = .false.      ! Activate tides
+      nn_tide_var   = 1          !  Variant of tidal parameter set and tide-potential computation
+      !                          !     (1: default; 0: compatibility with previous versions)
+      ln_tide_dia   = .false.    !  Enable tidal diagnostic output
       ln_tide_pot   = .false.               !  use tidal potential forcing
+         rn_tide_gamma = 0.7                   ! Tidal tilt factor
          ln_scal_load  = .false.               ! Use scalar approximation for
             rn_scal_load = 0.094               !     load potential
@@ -653 +657 @@
             !
       ln_tide_ramp  = .false.               !  Use linear ramp for tides at startup
-         rdttideramp   =    0.                 !  ramp duration in days
-      clname(1)     = 'DUMMY'               !  name of constituent - all tidal components must be set in namelist_cfg
+         rn_tide_ramp_dt = 0.               !  ramp duration in days
+      sn_tide_cnames(1) = 'DUMMY'               !  name of constituent - all tidal components must be set in namelist_cfg
 /
 !-----------------------------------------------------------------------
@@ -730 +734 @@
    filtide          = 'bdydta/amm12_bdytide_'   !  file name root of tidal forcing files
    ln_bdytide_2ddta = .false.                   !
-   ln_bdytide_conj  = .false.                   !
 /
 
@@ -1196 +1199 @@
 !!   namdiu       Cool skin and warm layer models                       (default: OFF)
 !!   namflo       float parameters                                      (default: OFF)
-!!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF)
 !!   nam_diadct   transports through some sections                      (default: OFF)
 !!   nam_diatmb   Top Middle Bottom Output                              (default: OFF)
@@ -1249 +1251 @@
       ln_ariane   = .true.    !    Input with Ariane tool convention(T)
       ln_flo_ascii= .true.    !    Output with Ariane tool netcdf convention(F) or ascii file (T)
-/
-!-----------------------------------------------------------------------
-&nam_diaharm   !   Harmonic analysis of tidal constituents              (default: OFF)
-!-----------------------------------------------------------------------
-    ln_diaharm = .false.   ! Choose tidal harmonic output or not
-       nit000_han = 1      !    First time step used for harmonic analysis
-       nitend_han = 75     !    Last time step used for harmonic analysis
-       nstep_han  = 15     !    Time step frequency for harmonic analysis
-       tname(1)   = 'M2'   !    Name of tidal constituents
-       tname(2)   = 'K1'   !              ---
 /
 !-----------------------------------------------------------------------

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
+^/utils/tools_dev_r11751_ENHANCE-05_SimonM-Harmonic_Analysis@HEAD tools
 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM