Changeset 11085

Timestamp:

2019-06-06T17:39:19+02:00 (4 years ago)

Author:

rrenshaw

Message:

code fixes

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• diadct.F90 (modified) (19 diffs)
• diaregmean.F90 (modified) (1 diff)

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -160 +160 @@
      INTEGER           ::   ios,jsec        ! Local integer output status for namelist read
      CHARACTER(len=3)  ::   jsec_str        ! name of the jsec
+     LOGICAL       ::   verbose     
+     verbose = .false.
 
      IF( nn_timing == 1 )   CALL timing_start('dia_dct_init')
@@ -204 +206 @@
 
      IF( lwp ) THEN
+       IF( verbose ) THEN
         WRITE(numout,*) " "
         WRITE(numout,*) "diadct_init: compute transports through sections "
@@ -223 +226 @@
            WRITE(numout,*) "       Frequency of write:       nn_dctwri = ",nn_dctwri
         ENDIF
+       ENDIF
 
         IF      ( nn_secdebug .GE. 1 .AND. nn_secdebug .LE. nb_sec_max )THEN
@@ -254 +258 @@
            ENDIF
         ELSE
-           CALL ctl_opn( numdct_vol,  'volume_transport', 'NEW', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. )
-           CALL ctl_opn( numdct_heat, 'heat_transport'  , 'NEW', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. )
-           CALL ctl_opn( numdct_salt, 'salt_transport'  , 'NEW', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. )
+           CALL ctl_opn( numdct_vol,  'volume_transport', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. )
+           CALL ctl_opn( numdct_heat, 'heat_transport'  , 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. )
+           CALL ctl_opn( numdct_salt, 'salt_transport'  , 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, numout,  .FALSE. )
         ENDIF
      ENDIF
@@ -357 +361 @@
      REAL(wp), POINTER, DIMENSION(:)    :: zwork !   "  
      REAL(wp), POINTER, DIMENSION(:,:,:):: zsum  !   "
+     LOGICAL       ::   verbose     
+     verbose = .false.
 
      !!---------------------------------------------------------------------    
@@ -371 +377 @@
      zsum(:,:,:) = 0.0
 
-     IF( lwp .AND. kt==nit000+nn_dct-1 ) THEN
+     IF( lwp .AND. kt==nit000+nn_dct-1 .AND. verbose ) THEN
          WRITE(numout,*) " "
          WRITE(numout,*) "diadct: compute transport"
@@ -408 +414 @@
             
 
-              IF( lwp .AND. kt==nit000+nn_dctwri-1 ) WRITE(numout,*)"      diadct: average and write at kt = ",kt
+              IF( lwp .AND. kt==nit000+nn_dctwri-1 .AND. verbose ) WRITE(numout,*)"      diadct: average and write at kt = ",kt
 
 
@@ -473 +479 @@
             IF( MOD(kt,nn_dctwri_h)==0 )THEN
 
-              IF( lwp .AND. kt==nit000+nn_dctwri_h-1 )WRITE(numout,*)"      diadct: average and write hourly files at kt = ",kt         
+              IF( lwp .AND. kt==nit000+nn_dctwri_h-1 .AND. verbose )WRITE(numout,*)"      diadct: average and write hourly files at kt = ",kt         
       
               !! divide arrays by nn_dctwri/nn_dct to obtain average
@@ -556 +562 @@
      LOGICAL :: llbon                                       ,&!local logical
                 lldebug                                       !debug the section
+     LOGICAL       ::   verbose     
+     verbose = .false.
      !!-------------------------------------------------------------------------------------
      CALL wrk_alloc( nb_point_max, directemp )
@@ -564 +572 @@
      !OPEN(UNIT=107,FILE='section_ijglobal.diadct', FORM='UNFORMATTED', ACCESS='SEQUENTIAL', STATUS='OLD',convert='LITTLE_ENDIAN')
      
-     write(numout,*) 'dct low-level pre open: big endian :',nproc,narea
+     IF ( verbose ) write(numout,*) 'dct low-level pre open: big endian :',nproc,narea
      OPEN(UNIT=107,FILE='section_ijglobal.diadct', FORM='UNFORMATTED', ACCESS='SEQUENTIAL', STATUS='OLD',convert='BIG_ENDIAN')
      
@@ -632 +640 @@
         READ(numdct_in)iptglo
 
-        IF ( ln_NOOS ) THEN
+        IF ( ln_NOOS .AND. verbose ) THEN
            WRITE(numout,*) 'Section name = ',TRIM(secs(jsec)%name)
            WRITE(numout,*) 'coordSec = ',secs(jsec)%coordSec
@@ -663 +671 @@
            !read points'coordinates and directions 
            !--------------------------------------
-           IF ( ln_NOOS ) THEN
+           IF ( ln_NOOS .AND. verbose ) THEN
               WRITE(numout,*) 'Coords and direction read'
            ENDIF
@@ -766 +774 @@
      nb_sec = jsec-1   !number of section read in the file
 
-     IF( lwp )  WRITE(numout,*)'diadct: read sections: Finished readsec.'
+     IF( lwp .AND. verbose )  WRITE(numout,*)'diadct: read sections: Finished readsec.'
 
      CALL wrk_dealloc( nb_point_max, directemp )
@@ -1823 +1831 @@
      REAL(wp), DIMENSION(3) :: tmp_iom_output
      REAL(wp)               :: max_iom_val
+     LOGICAL       ::   verbose     
+     verbose = .false.
      
      !!------------------------------------------------------------- 
@@ -1828 +1838 @@
      
      
-     IF( lwp ) THEN
+     IF( lwp .AND. verbose ) THEN
         WRITE(numout,*) " "
         WRITE(numout,*) "dia_dct_wri_NOOS: write transports through sections at timestep: ", kt
@@ -2176 +2186 @@
          
          noos_var_sect_name = "noos_" // trim(noos_sect_name) // '_trans'
-         if ( lwp ) WRITE(numout,*) 'dia_dct_wri_NOOS iom_put: ', kt,ksec, noos_var_sect_name
+         if ( lwp .AND. verbose ) WRITE(numout,*) 'dia_dct_wri_NOOS iom_put: ', kt,ksec, noos_var_sect_name
          CALL iom_put( noos_var_sect_name,  noos_iom_dummy )
          noos_iom_dummy(:,:,:) = 0.
@@ -2212 +2222 @@
          
          noos_var_sect_name =  "noos_" // trim(noos_sect_name) // '_heat'
-         if ( lwp ) WRITE(numout,*) 'dia_dct_wri_NOOS iom_put: ', kt,ksec, noos_var_sect_name
+         if ( lwp .AND. verbose ) WRITE(numout,*) 'dia_dct_wri_NOOS iom_put: ', kt,ksec, noos_var_sect_name
          CALL iom_put(noos_var_sect_name,  noos_iom_dummy )  
          noos_iom_dummy(:,:,:) = 0.
@@ -2249 +2259 @@
          
          noos_var_sect_name = "noos_" // trim(noos_sect_name) // '_salt'
-         if ( lwp ) WRITE(numout,*) 'dia_dct_wri_NOOS iom_put: ', kt,ksec, noos_var_sect_name
+         if ( lwp .AND. verbose ) WRITE(numout,*) 'dia_dct_wri_NOOS iom_put: ', kt,ksec, noos_var_sect_name
          CALL iom_put(noos_var_sect_name,  noos_iom_dummy )
          noos_iom_dummy(:,:,:) = 0.         
@@ -2361 +2371 @@
      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   noos_iom_dummy
      INTEGER               :: IERR
+     LOGICAL       ::   verbose     
+     verbose = .false.
      
      !!------------------------------------------------------------- 
 
-     IF( lwp ) THEN
+     IF( lwp .AND. verbose ) THEN
         WRITE(numout,*) " "
         WRITE(numout,*) "dia_dct_wri_NOOS_h: write transports through section Transect:",ksec-1," at timestep: ", hr

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis3/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90

@@ -753 +753 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   dummy_zrmet
       LOGICAL       ::   verbose     
-      verbose = .True.
+      verbose = .false.