Changeset 8155 for branches/UKMO/dev_r5518_GO6_MEDUSA_dummyrun/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

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/NEMO/TOP_SRC/CFC/trcnam_cfc.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_MEDUSA_dummyrun/NEMOGCM/NEMO/TOP_SRC/CFC/trcnam_cfc.F90

@@ -49 +49 @@
       TYPE(DIAG), DIMENSION(jp_cfc_2d) :: cfcdia2d
       !!
-      NAMELIST/namcfcdate/ ndate_beg, nyear_res
+      NAMELIST/namcfcdate/ ndate_beg, nyear_res, simu_type 
       NAMELIST/namcfcdia/  cfcdia2d     ! additional diagnostics
       !!----------------------------------------------------------------------
@@ -72 +72 @@
          WRITE(numout,*) '    initial calendar date (aammjj) for CFC  ndate_beg = ', ndate_beg
          WRITE(numout,*) '    restoring time constant (year)          nyear_res = ', nyear_res
+         IF (simu_type==1) THEN
+            WRITE(numout,*) ' CFC running on SPIN-UP mode             simu_type = ', simu_type
+         ELSEIF (simu_type==2) THEN
+            WRITE(numout,*) ' CFC running on HINDCAST/PROJECTION mode simu_type = ', simu_type
+         ENDIF
       ENDIF
       nyear_beg = ndate_beg / 10000