Changeset 516 for trunk/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2006-10-05T17:53:31+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_072 : CT : - lights modifications to ensure good control prints for the restartability & reproductibility tests

• build all ocean.output_XXXX files only if logical namelist ln_ctl is TRUE, in all case keep the initial ocean.output file (require a new namelist namctl)
• conditionning some prints using nprint parameter

File:

• trunk/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (7 diffs)

trunk/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -100 +100 @@
       ENDIF
 
-
       ! Build the vertical coordinate system
       ! ------------------------------------
@@ -115 +114 @@
 
 !!bug gm control print:
-      write(numout,*) ' MIN val mbathy ', MINVAL( mbathy(:,:) ), ' MAX ', MAXVAL( mbathy(:,:) )
-      write(numout,*) ' MIN val depth t ', MINVAL( fsdept(:,:,:) ),   &
-         &                   ' w ',   MINVAL( fsdepw(:,:,:) ), '3w ', MINVAL( fsde3w(:,:,:) )
-      write(numout,*) ' MIN val e3    t ', MINVAL( fse3t(:,:,:) ), ' f ', MINVAL( fse3f(:,:,:) ),  &
-         &                   ' u ',   MINVAL( fse3u(:,:,:) ), ' u ', MINVAL( fse3v(:,:,:) ),  &
-         &                   ' uw',   MINVAL( fse3uw(:,:,:)), ' vw', MINVAL( fse3vw(:,:,:)),   &
-         &                   ' w ',   MINVAL( fse3w(:,:,:) )
-
-      write(numout,*) ' MAX val depth t ', MAXVAL( fsdept(:,:,:) ),   &
-         &                   ' w ',   MAXVAL( fsdepw(:,:,:) ), '3w ', MAXVAL( fsde3w(:,:,:) )
-      write(numout,*) ' MAX val e3    t ', MAXVAL( fse3t(:,:,:) ), ' f ', MAXVAL( fse3f(:,:,:) ),  &
-         &                   ' u ',   MAXVAL( fse3u(:,:,:) ), ' u ', MAXVAL( fse3v(:,:,:) ),  &
-         &                   ' uw',   MAXVAL( fse3uw(:,:,:)), ' vw', MAXVAL( fse3vw(:,:,:)),   &
-         &                   ' w ',   MAXVAL( fse3w(:,:,:) )
+      IF( nprint == 1 .AND. lwp )   THEN
+         WRITE(numout,*) ' MIN val mbathy ', MINVAL( mbathy(:,:) ), ' MAX ', MAXVAL( mbathy(:,:) )
+         WRITE(numout,*) ' MIN val depth t ', MINVAL( fsdept(:,:,:) ),   &
+            &                   ' w ',   MINVAL( fsdepw(:,:,:) ), '3w ', MINVAL( fsde3w(:,:,:) )
+         WRITE(numout,*) ' MIN val e3    t ', MINVAL( fse3t(:,:,:) ), ' f ', MINVAL( fse3f(:,:,:) ),  &
+            &                   ' u ',   MINVAL( fse3u(:,:,:) ), ' u ', MINVAL( fse3v(:,:,:) ),  &
+            &                   ' uw',   MINVAL( fse3uw(:,:,:)), ' vw', MINVAL( fse3vw(:,:,:)),   &
+            &                   ' w ',   MINVAL( fse3w(:,:,:) )
+
+         WRITE(numout,*) ' MAX val depth t ', MAXVAL( fsdept(:,:,:) ),   &
+            &                   ' w ',   MAXVAL( fsdepw(:,:,:) ), '3w ', MAXVAL( fsde3w(:,:,:) )
+         WRITE(numout,*) ' MAX val e3    t ', MAXVAL( fse3t(:,:,:) ), ' f ', MAXVAL( fse3f(:,:,:) ),  &
+            &                   ' u ',   MAXVAL( fse3u(:,:,:) ), ' u ', MAXVAL( fse3v(:,:,:) ),  &
+            &                   ' uw',   MAXVAL( fse3uw(:,:,:)), ' vw', MAXVAL( fse3vw(:,:,:)),   &
+            &                   ' w ',   MAXVAL( fse3w(:,:,:) )
+      ENDIF
 !!!bug gm
 
@@ -421 +422 @@
          !                                            ! =============== !
 
-         CALL iom_open ( 'bathy_level.nc', inum )   ! Level bathymetry
-         IF ( inum > 0 ) THEN
+         IF( ln_zco )   THEN
+            CALL iom_open ( 'bathy_level.nc', inum )   ! Level bathymetry
             CALL iom_get ( inum, jpdom_data, 'Bathy_level', bathy )
             CALL iom_close (inum)
             mbathy(:,:) = INT( bathy(:,:) )
-         ELSE 
-            IF( ln_zco ) THEN
-               CALL ctl_stop( '    zgr_bat : unable to read the file ' )
-            ELSE
-               IF(lwp) WRITE(numout,*)'    zgr_bat : bathy_level will be computed from bathy_meter'
-               nstop = nstop - 1        ! supress the error count for opening 'bathy_level.nc'
-               mbathy(:,:) = jpkm1      
-            ENDIF
          ENDIF
 
-         CALL iom_open ( 'bathy_meter.nc', inum )   ! meter bathymetry
-         IF ( inum > 0 ) THEN
+         IF( ln_zps .OR. ln_sco )   THEN
+            CALL iom_open ( 'bathy_meter.nc', inum )   ! meter bathymetry
             CALL iom_get ( inum, jpdom_data, 'Bathymetry', bathy )
             CALL iom_close (inum)
-         ELSE 
-            IF( ln_zps .OR. ln_sco ) THEN
-              CALL ctl_stop( '    zgr_bat : unable to read the file ' )
-            ELSE
-               bathy(:,:) = 0.e0        ! initialisation
-               nstop = nstop - 1        ! supress the error count for opening 'bathy_level.nc'
-               IF(lwp) WRITE(numout,*)'    zgr_bat : bathy_meter not found, but not used, bathy array set to zero'
-            ENDIF
          ENDIF
          !                                            ! =============== !
@@ -969 +954 @@
          zrmax  = EXP( -(gphit(10,jj)/8)**2 )
          ztaper = EXP( -(FLOAT(jj-74)/10.)**2 )
-         write(numout,*) jj, (FLOAT(jj-74)/10.), ztaper,(gphit(10,jj)/8), zrmax
-      END DO
-
-      write(numout,*) ' bathy  MAX ', MAXVAL( bathy(:,:) ), ' MIN ', MINVAL( bathy(:,:) )
-      write(numout,*) ' hbatt  MAX ', MAXVAL( hbatt(:,:) ), ' MIN ', MINVAL( hbatt(:,:) )
+         IF( nprint == 1 .AND. lwp ) WRITE(numout,*) jj, (FLOAT(jj-74)/10.), ztaper,(gphit(10,jj)/8), zrmax
+      END DO
+
+      IF( nprint == 1 .AND. lwp )   THEN
+         WRITE(numout,*) ' bathy  MAX ', MAXVAL( bathy(:,:) ), ' MIN ', MINVAL( bathy(:,:) )
+         WRITE(numout,*) ' hbatt  MAX ', MAXVAL( hbatt(:,:) ), ' MIN ', MINVAL( hbatt(:,:) )
+      ENDIF
 
       ! Control print
@@ -1048 +1035 @@
       hiff(:,:) = MIN( hiff(:,:), hbatf(:,:) )
 
-      write(numout,*) ' MAX val hif   t ', MAXVAL( hift(:,:) ), ' f ', MAXVAL( hiff(:,:) ),  &
-         &                        ' u ',   MAXVAL( hifu(:,:) ), ' v ', MAXVAL( hifv(:,:) )
-      write(numout,*) ' MIN val hif   t ', MINVAL( hift(:,:) ), ' f ', MINVAL( hiff(:,:) ),  &
-         &                        ' u ',   MINVAL( hifu(:,:) ), ' v ', MINVAL( hifv(:,:) )
-      write(numout,*) ' MAX val hbat  t ', MAXVAL( hbatt(:,:) ), ' f ', MAXVAL( hbatf(:,:) ),  &
-         &                        ' u ',   MAXVAL( hbatu(:,:) ), ' v ', MAXVAL( hbatv(:,:) )
-      write(numout,*) ' MIN val hbat  t ', MINVAL( hbatt(:,:) ), ' f ', MINVAL( hbatf(:,:) ),  &
-         &                        ' u ',   MINVAL( hbatu(:,:) ), ' v ', MINVAL( hbatv(:,:) )
+      IF( nprint == 1 .AND. lwp )   THEN
+         WRITE(numout,*) ' MAX val hif   t ', MAXVAL( hift(:,:) ), ' f ', MAXVAL( hiff(:,:) ),  &
+            &                        ' u ',   MAXVAL( hifu(:,:) ), ' v ', MAXVAL( hifv(:,:) )
+         WRITE(numout,*) ' MIN val hif   t ', MINVAL( hift(:,:) ), ' f ', MINVAL( hiff(:,:) ),  &
+            &                        ' u ',   MINVAL( hifu(:,:) ), ' v ', MINVAL( hifv(:,:) )
+         WRITE(numout,*) ' MAX val hbat  t ', MAXVAL( hbatt(:,:) ), ' f ', MAXVAL( hbatf(:,:) ),  &
+            &                        ' u ',   MAXVAL( hbatu(:,:) ), ' v ', MAXVAL( hbatv(:,:) )
+         WRITE(numout,*) ' MIN val hbat  t ', MINVAL( hbatt(:,:) ), ' f ', MINVAL( hbatf(:,:) ),  &
+            &                        ' u ',   MINVAL( hbatu(:,:) ), ' v ', MINVAL( hbatv(:,:) )
+      ENDIF
 !! helsinki
 
@@ -1069 +1058 @@
       END DO
 
-      write(numout,*) 'gsigw 1 jpk    ', gsigw(1), gsigw(jpk)
+      IF( nprint == 1 .AND. lwp ) WRITE(numout,*) 'gsigw 1 jpk    ', gsigw(1), gsigw(jpk)
 
 !!org DO jk = 1, jpk
@@ -1140 +1129 @@
       END DO
 
-      write(numout,*) ' MIN val mbathy h90 ', MINVAL( mbathy(:,:) ), ' MAX ', MAXVAL( mbathy(:,:) )
+      IF( nprint == 1 .AND. lwp ) WRITE(numout,*) ' MIN val mbathy h90 ', MINVAL( mbathy(:,:) ), ' MAX ', MAXVAL( mbathy(:,:) )