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

Timestamp:

2018-11-13T18:21:16+01:00 (6 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/DYN

Files:

• dynspg_exp.F90 (modified) (1 diff)
• dynspg_flt.F90 (modified) (2 diffs)
• dynspg_ts.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_exp.F90

@@ -107 +107 @@
 CONTAINS
    SUBROUTINE dyn_spg_exp( kt )       ! Empty routine
+   IMPLICIT NONE
+      INTEGER, INTENT(in)  ::   kt   ! ocean time-step index  
       WRITE(*,*) 'dyn_spg_exp: You should not have seen this print! error?', kt
    END SUBROUTINE dyn_spg_exp

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -395 +395 @@
 ! Caution : extra-hallow
 ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj)
+            IF(nn_timing == 2)  CALL timing_start('iom_rstget')
             CALL iom_get( numror, jpdom_autoglo, 'gcx' , gcx (1:jpi,1:jpj) )
             CALL iom_get( numror, jpdom_autoglo, 'gcxb', gcxb(1:jpi,1:jpj) )
+            IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
             IF( neuler == 0 )   gcxb(:,:) = gcx (:,:)
          ELSE
@@ -405 +407 @@
 ! Caution : extra-hallow
 ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj)
+         IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'gcx' , gcx (1:jpi,1:jpj) )
          CALL iom_rstput( kt, nitrst, numrow, 'gcxb', gcxb(1:jpi,1:jpj) )
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !

branches/UKMO/dev_r5518_GO6_package_FOAMv14/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -1019 +1019 @@
       !
       IF( TRIM(cdrw) == 'READ' ) THEN
+         IF(nn_timing == 2)  CALL timing_start('iom_rstget')
          CALL iom_get( numror, jpdom_autoglo, 'ub2_b'  , ub2_b  (:,:) )   
          CALL iom_get( numror, jpdom_autoglo, 'vb2_b'  , vb2_b  (:,:) ) 
@@ -1036 +1037 @@
          ENDIF
 #endif
+      IF(nn_timing == 2)  CALL timing_stop('iom_rstget')
       !
       ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN
+         IF(nn_timing == 2)  CALL timing_start('iom_rstput')
          CALL iom_rstput( kt, nitrst, numrow, 'ub2_b'   , ub2_b  (:,:) )
          CALL iom_rstput( kt, nitrst, numrow, 'vb2_b'   , vb2_b  (:,:) )
@@ -1056 +1059 @@
          ENDIF
 #endif
+         IF(nn_timing == 2)  CALL timing_stop('iom_rstput')
       ENDIF
       !