Changeset 10302 for branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/IOM

Timestamp:

2018-11-13T18:21:16+01:00 (5 years ago)

Author:

dford

Message:

Merge in revisions 8447:10159 of dev_r5518_GO6_package.

Location:

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/IOM

Files:

• iom.F90 (modified) (4 diffs)
• restart.F90 (modified) (5 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

@@ -44 +44 @@
    USE ioipsl, ONLY :  ju2ymds    ! for calendar
    USE crs             ! Grid coarsening
+   USE timing
 
    IMPLICIT NONE
@@ -1399 +1400 @@
       IF ( ln_mskland ) THEN
          ! mask land points, keep values on coast line -> specific mask for U, V and W points
+
+
          SELECT CASE ( cdgrd )
-         CASE('T')   ;   zmask(:,:,:)       = tmask(:,:,:)
-         CASE('U')   ;   zmask(2:jpim1,:,:) = tmask(2:jpim1,:,:) + tmask(3:jpi,:,:)   ;   CALL lbc_lnk( zmask, 'U', 1. )
-         CASE('V')   ;   zmask(:,2:jpjm1,:) = tmask(:,2:jpjm1,:) + tmask(:,3:jpj,:)   ;   CALL lbc_lnk( zmask, 'V', 1. )
-         CASE('W')   ;   zmask(:,:,2:jpk  ) = tmask(:,:,1:jpkm1) + tmask(:,:,2:jpk)   ;   zmask(:,:,1) = tmask(:,:,1)
-         END SELECT
+         ! The masks applied here are specifically used to mask out duplicate 
+         ! data points in wrap columns and N-fold rows in order to ensure bit 
+         ! reproducibility of diagnostics which have not undergone an explicit
+         ! lbc_lnk prior to writing. Such fields are prone to junk values at 
+         ! duplicate points since those points are often excluded from the 
+         ! core field computation process. 
+         CASE('T')   
+            zmask(:,:,:) = tmask_i_diag(:,:,:)
+         CASE('U')      
+            zmask(:,:,:) = umask_i_diag(:,:,:)
+    CASE('V')   
+            zmask(:,:,:) = vmask_i_diag(:,:,:)
+         CASE('W')   
+            zmask(:,:,2:jpk  ) = tmask_i_diag(:,:,1:jpkm1) + tmask_i_diag(:,:,2:jpk)   
+            zmask(:,:,1) = tmask_i_diag(:,:,1)
+        END SELECT
          !
 #if ! defined key_xios2
@@ -1634 +1648 @@
       WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('trendT_even'      , freq_op=cl1//'ts', freq_offset='0ts')
       WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('trendT_odd'       , freq_op=cl1//'ts', freq_offset='-1ts')
+      WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('ptrd_T_even'      , freq_op=cl1//'ts', freq_offset='0ts')
+      WRITE(cl1,'(i1)')        2   ;   CALL iom_set_field_attr('ptrd_T_odd'       , freq_op=cl1//'ts', freq_offset='-1ts')
       WRITE(cl1,'(i1)')  nn_fsbc   ;   CALL iom_set_field_attr('SBC'             , freq_op=cl1//'ts', freq_offset='0ts')
       WRITE(cl1,'(i1)')  nn_fsbc   ;   CALL iom_set_field_attr('SBC_scalar'      , freq_op=cl1//'ts', freq_offset='0ts')
@@ -1642 +1658 @@
       f_op%timestep = 2        ;  f_of%timestep = 0  ; CALL iom_set_field_attr('trendT_even'      , freq_op=f_op, freq_offset=f_of)
       f_op%timestep = 2        ;  f_of%timestep = -1 ; CALL iom_set_field_attr('trendT_odd'       , freq_op=f_op, freq_offset=f_of)
+      f_op%timestep = 2        ;  f_of%timestep = 0  ; CALL iom_set_field_attr('ptrd_T_even'      , freq_op=f_op, freq_offset=f_of)
+      f_op%timestep = 2        ;  f_of%timestep = -1 ; CALL iom_set_field_attr('ptrd_T_odd'       , freq_op=f_op, freq_offset=f_of)
       f_op%timestep = nn_fsbc  ;  f_of%timestep = 0  ; CALL iom_set_field_attr('SBC'             , freq_op=f_op, freq_offset=f_of)
       f_op%timestep = nn_fsbc  ;  f_of%timestep = 0  ; CALL iom_set_field_attr('SBC_scalar'      , freq_op=f_op, freq_offset=f_of)

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90

@@ -26 +26 @@
    USE divcur          ! hor. divergence and curl      (div & cur routines)
    USE sbc_oce         ! for icesheet freshwater input variables
+   USE timing
 
    IMPLICIT NONE
@@ -134 +135 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step
       !!----------------------------------------------------------------------
-
+                     IF(nn_timing == 2)  CALL timing_start('iom_rstput')
                      CALL iom_rstput( kt, nitrst, numrow, 'rdt'    , rdt       )   ! dynamics time step
                      CALL iom_rstput( kt, nitrst, numrow, 'rdttra1', rdttra(1) )   ! surface tracer time step
@@ -168 +169 @@
                      ENDIF
                      ENDIF
+                     IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
 
       IF( kt == nitrst ) THEN
@@ -237 +239 @@
 
       ! Check dynamics and tracer time-step consistency and force Euler restart if changed
+      IF(nn_timing == 2)  CALL timing_start('iom_rstget')
       IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 )   THEN
          CALL iom_get( numror, 'rdt', zrdt )
@@ -300 +303 @@
          antarctica_icesheet_timelapsed = 0.0
       ENDIF
-
+      IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
       IF( neuler == 0 ) THEN                                  ! Euler restart (neuler=0)
          tsb  (:,:,:,:) = tsn  (:,:,:,:)                             ! all before fields set to now values