Changeset 8155 for branches/UKMO/dev_r5518_GO6_MEDUSA_dummyrun/NEMOGCM/CONFIG/SHARED/namelist_cfc_ref

Timestamp:

2017-06-08T14:44:59+02:00 (7 years ago)

Author:

frrh

Message:

Merge branches/NERC/dev_r5518_NOC_MEDUSA_Stable revisions 5711:8147, thus
svn merge -r 5711:8147.

We also resolve conflicts by hand, typically relating to retaining files
in the AGRIF direcories. Nothing in main OPA_SRC aor TOP_SRC code.

File:

• branches/UKMO/dev_r5518_GO6_MEDUSA_dummyrun/NEMOGCM/CONFIG/SHARED/namelist_cfc_ref (modified) (1 diff)

branches/UKMO/dev_r5518_GO6_MEDUSA_dummyrun/NEMOGCM/CONFIG/SHARED/namelist_cfc_ref

@@ -7 +7 @@
 !,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
    ndate_beg  = 300101    !  datedeb1
-   nyear_res  = 1932      !  iannee1
+   nyear_res  = 1600      !  iannee1
+   simu_type  = 1         ! kind of Simulation: 1 = SPIN-UP (90y-cycle)
+!!                                           !! 2 = Hindcast/proj (100y cycle)
 /
 !'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''