Changeset 5734 for branches

Timestamp:

2015-09-11T17:21:39+02:00 (9 years ago)

Author:

rfurner

Message:

namelist changes for additional tidal constituents, and small bug fix to tideini

Location:

branches/UKMO/2014_Surge_Modelling/NEMOGCM

Files:

• CONFIG/AMM7_SURGE/EXP00/namelist_cfg (modified) (3 diffs)
• NEMO/OPA_SRC/SBC/tideini.F90 (modified) (1 diff)

branches/UKMO/2014_Surge_Modelling/NEMOGCM/CONFIG/AMM7_SURGE/EXP00/namelist_cfg

@@ -14 +14 @@
    cn_ocerst_in   = "amm12_restart_oce"   !  suffix of ocean restart name (input)
    cn_ocerst_out  = "restart_oce_out"   !  suffix of ocean restart name (input)
-   nn_istate   =       1   !  output the initial state (1) or not (0)
+   nn_istate   =       0   !  output the initial state (1) or not (0)
    nn_stock    =   52560   !  frequency of creation of a restart file (modulo referenced to 1)
    nn_write    =     144   !  frequency of write in the output file   (modulo referenced to nit000) 
@@ -199 +199 @@
    clname(2)     =   'O1'
    clname(3)     =   'P1'
-   clname(4)     =   'S1'
-   clname(5)     =   'K1'
-   clname(6)     =   '2N2'
-   clname(7)     =   'MU2'
-   clname(8)     =   'N2'
-   clname(9)     =   'NU2'
-   clname(10)    =   'M2'
-   clname(11)    =   'L2'
-   clname(12)    =   'T2'
-   clname(13)    =   'S2'
-   clname(14)    =   'K2'
-   clname(15)    =   'M4'
+   clname(4)     =   'K1'
+   clname(5)     =   '2N2'
+   clname(6)     =   'MU2'
+   clname(7)     =   'N2'
+   clname(8)     =   'NU2'
+   clname(9)     =   'M2'
+   clname(10)    =   'L2'
+   clname(11)    =   'T2'
+   clname(12)    =   'S2'
+   clname(13)    =   'K2'
+   clname(14)    =   'M4'
+   clname(15)    =   '2MK6'
+   clname(16)    =   '2MS6'
+   clname(17)    =   '2SM2'
+   clname(18)    =   '3M2S2'
+   clname(19)    =   'Lam2'
+   clname(20)    =   'M6'
+   clname(21)    =   'MK3'
+   clname(22)    =   'MN4'
+   clname(23)    =   'MNS2'
+   clname(24)    =   'MO3'
+   clname(25)    =   'MS4'
+   clname(26)    =   'MSN2'
 /
 !-----------------------------------------------------------------------
@@ -233 +244 @@
 !-----------------------------------------------------------------------
    filtide      = 'bdydta/amm7_bdytide_'         !  file name root of tidal forcing files
+   ln_bdytide_2ddta = .true. 
 /
 !-----------------------------------------------------------------------

branches/UKMO/2014_Surge_Modelling/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90

@@ -48 +48 @@
     INTEGER  :: ji, jk
     INTEGER, INTENT( in ) ::   kt     ! ocean time-step
-    CHARACTER(LEN=4), DIMENSION(jpmax_harmo) :: clname
+    CHARACTER(LEN=5), DIMENSION(jpmax_harmo) :: clname
     INTEGER  ::   ios                 ! Local integer output status for namelist read
     !