Changeset 6164 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

Timestamp:

2015-12-23T18:42:01+01:00 (8 years ago)

Author:

jpalmier

Message:

JPALM -- 23-12-2015 -- 1_ adapt CFC in MEDUSA branch - now Working properly 2_ add diagnostics to Ideal tracer

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (3 diffs)

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
-            !! 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
+        ! IF ( ln_rstdate ) THEN
+        !    CALL ju2ymds( fjulday + 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,*)
@@ -211 +200 @@
       if (lwp) write (numout,'(a,3f15.5)') 'Sediment Ca ', &
          &        fq0, fq1, fq2
-      !!
-      !! AXY (07/07/15): read in temporally averaged fields for DMS
-      !!                 calculations
-      !!
-      IF( iom_varid( numrtr, 'B_DMS_CHN', ldstop = .FALSE. ) > 0 ) THEN
-         !! YES; in which case read them
-         !!
-         IF(lwp) WRITE(numout,*) ' MEDUSA averaged properties for DMS present - reading in ...'
-         CALL iom_get( numrtr, jpdom_autoglo, 'B_DMS_CHN',  zb_dms_chn(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'N_DMS_CHN',  zn_dms_chn(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'B_DMS_CHD',  zb_dms_chd(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'N_DMS_CHD',  zn_dms_chd(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'B_DMS_MLD',  zb_dms_mld(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'N_DMS_MLD',  zn_dms_mld(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'B_DMS_QSR',  zb_dms_qsr(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'N_DMS_QSR',  zn_dms_qsr(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'B_DMS_DIN',  zb_dms_din(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'N_DMS_DIN',  zn_dms_din(:,:)  )
-      ELSE
-         !! NO; in which case set them to zero
-         !!
-         IF(lwp) WRITE(numout,*) ' MEDUSA averaged properties for DMS absent - setting to zero ...'
-         zb_dms_chn(:,:)  = 0.0   !! CHN
-         zn_dms_chn(:,:)  = 0.0
-         zb_dms_chd(:,:)  = 0.0   !! CHD
-         zn_dms_chd(:,:)  = 0.0
-         zb_dms_mld(:,:)  = 0.0   !! MLD
-         zn_dms_mld(:,:)  = 0.0
-         zb_dms_qsr(:,:)  = 0.0   !! QSR
-         zn_dms_qsr(:,:)  = 0.0
-         zb_dms_din(:,:)  = 0.0   !! DIN
-         zn_dms_din(:,:)  = 0.0
-      ENDIF
-      !!
-      !! calculate stats on these fields
-      IF(lwp) WRITE(numout,*) ' MEDUSA averaged properties for DMS stats (min, max, sum) ...'
-      fq0 = MINVAL(zn_dms_chn(:,:))
-      fq1 = MAXVAL(zn_dms_chn(:,:))
-      fq2 = SUM(zn_dms_chn(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, CHN ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_chd(:,:))
-      fq1 = MAXVAL(zn_dms_chd(:,:))
-      fq2 = SUM(zn_dms_chd(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, CHD ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_mld(:,:))
-      fq1 = MAXVAL(zn_dms_mld(:,:))
-      fq2 = SUM(zn_dms_mld(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, MLD ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_qsr(:,:))
-      fq1 = MAXVAL(zn_dms_qsr(:,:))
-      fq2 = SUM(zn_dms_qsr(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, QSR ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_din(:,:))
-      fq1 = MAXVAL(zn_dms_din(:,:))
-      fq2 = SUM(zn_dms_din(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, DIN ', fq0, fq1, fq2
-
 #endif
  
@@ -349 +281 @@
       if (lwp) write (numout,'(a,3f15.5)') 'Sediment Ca ', &
          &        fq0, fq1, fq2
-      !!
-      !! AXY (07/07/15): write out temporally averaged fields for DMS
-      !!                 calculations
-      !!
-      IF(lwp) WRITE(numout,*) ' MEDUSA averaged properties for DMS - writing out ...'
-      CALL iom_rstput( kt, nitrst, numrtw, 'B_DMS_CHN',  zb_dms_chn(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'N_DMS_CHN',  zn_dms_chn(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'B_DMS_CHD',  zb_dms_chd(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'N_DMS_CHD',  zn_dms_chd(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'B_DMS_MLD',  zb_dms_mld(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'N_DMS_MLD',  zn_dms_mld(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'B_DMS_QSR',  zb_dms_qsr(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'N_DMS_QSR',  zn_dms_qsr(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'B_DMS_DIN',  zb_dms_din(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'N_DMS_DIN',  zn_dms_din(:,:)  )
-      !!
-      !! calculate stats on these fields
-      IF(lwp) WRITE(numout,*) ' MEDUSA averaged properties for DMS stats (min, max, sum) ...'
-      fq0 = MINVAL(zn_dms_chn(:,:))
-      fq1 = MAXVAL(zn_dms_chn(:,:))
-      fq2 = SUM(zn_dms_chn(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, CHN ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_chd(:,:))
-      fq1 = MAXVAL(zn_dms_chd(:,:))
-      fq2 = SUM(zn_dms_chd(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, CHD ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_mld(:,:))
-      fq1 = MAXVAL(zn_dms_mld(:,:))
-      fq2 = SUM(zn_dms_mld(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, MLD ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_qsr(:,:))
-      fq1 = MAXVAL(zn_dms_qsr(:,:))
-      fq2 = SUM(zn_dms_qsr(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, QSR ', fq0, fq1, fq2
-      fq0 = MINVAL(zn_dms_din(:,:))
-      fq1 = MAXVAL(zn_dms_din(:,:))
-      fq2 = SUM(zn_dms_din(:,:))
-      if (lwp) write (numout,'(a,3f15.5)') 'DMS, DIN ', fq0, fq1, fq2
-      !! 
 #endif