Changeset 6173 for branches/NERC

Timestamp:

2015-12-28T20:09:32+01:00 (9 years ago)

Author:

jpalmier

Message:

JPALM --28-12-2015-- cleaning

Location:

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC

Files:

• MEDUSA/trcini_medusa.F90 (modified) (1 diff)
• MEDUSA/trcsed_medusa.F90 (modified) (1 diff)
• trcrst.F90 (modified) (1 diff)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcini_medusa.F90

@@ -38 +38 @@
    !! JPALM (14/09/15)
    LOGICAL, PUBLIC ::                  &
-      ln_ccd = .FALSE.
+      ln_ccd = .TRUE.
 
    INTEGER ::                          &

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90

@@ -42 +42 @@
    !! AXY (10/02/09)
    LOGICAL, PUBLIC ::                  &
-      bdustfer = .FALSE.
+      bdustfer = .TRUE.
    REAL(wp), PUBLIC ::                 &
       sedfeinput = 1.e-9_wp  ,         &

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -85 +85 @@
       ! except if we write tracer restart files every tracer time step or if a tracer restart file was writen at nitend - 2*nn_dttrc + 1
       IF( kt == nitrst - 2*nn_dttrc .OR. nstock == nn_dttrc .OR. ( kt == nitend - nn_dttrc .AND. .NOT. lrst_trc ) ) THEN
-        ! IF ( ln_rstdate ) THEN
-        !    CALL ju2ymds( fjulday + rdttra(1) / rday, iyear, imonth, iday, zsec )
-        !    WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday
-        ! ELSE
+         IF ( ln_rstdate ) THEN
+            !! JPALM -- 22-12-2015 -- modif to get the good date on restart trc
+            !file name
+            !!                     -- the condition to open the rst file is not
+            !the same than for the dynamic rst.
+            !!                     -- here it - for an obscure reason - is open
+            !2 time-step before the restart writing process
+            !!                     instead of 1.
+            !!                     -- i am not sure if someone forgot +1 in the
+            !if loop condition as
+            !!                     it is writen in all comments nitrst -
+            !2*nn_dttrc + 1 and the condition is nitrst - 2*nn_dttrc
+            !!                     -- nevertheless we didn't wanted to broke
+            !something already working 
+            !!                     and just adapted the part we added.
+            !!                     -- So instead of calling ju2ymds( fjulday +
+            !(rdttra(1)) ....
+            !!                     we call ju2ymds( fjulday + (2*rdttra(1))
+            !.....
+            !!--------------------------------------------------------------------      
+            CALL ju2ymds( fjulday + (2*rdttra(1)) / rday, iyear, imonth, iday,
+zsec )
+            WRITE(clkt, '(i4.4,2i2.2)') iyear, imonth, iday
+         ELSE
             ! beware of the format used to write kt (default is i8.8, that should be large enough)
             IF( nitrst > 1.0e9 ) THEN   ;   WRITE(clkt,*       ) nitrst
             ELSE                        ;   WRITE(clkt,'(i8.8)') nitrst
             ENDIF
-        ! ENDIF
+         ENDIF
          ! create the file
          IF(lwp) WRITE(numout,*)