Changeset 11782 for NEMO/branches/2019/dev_r11756_text_output/src/SAS

Timestamp:

2019-10-24T10:30:30+02:00 (5 years ago)

Author:

andmirek

Message:

Ticket #2320 print levels in ICE/OCE

Location:

NEMO/branches/2019/dev_r11756_text_output/src/SAS

Files:

• daymod.F90 (modified) (2 diffs)
• nemogcm.F90 (modified) (9 diffs)
• sbcssm.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r11756_text_output/src/SAS/daymod.F90

@@ -134 +134 @@
 
       ! control print
-      IF(lwp) WRITE(numout,'(a,i6,a,i2,a,i2,a,i8,a,i8,a,i8,a,i8)')   &
+      IF(lwp .AND. nprint > 0) WRITE(numout,'(a,i6,a,i2,a,i2,a,i8,a,i8,a,i8,a,i8)')   &
            &                   ' =======>> 1/2 time step before the start of the run DATE Y/M/D = ',   &
            &                   nyear, '/', nmonth, '/', nday, '  nsec_day:', nsec_day, '  nsec_week:', nsec_week, '  &
@@ -267 +267 @@
          CALL ymds2ju( nyear, 01, 01, 0.0, fjulstartyear )
          !
-         IF(lwp) WRITE(numout,'(a,i8,a,i4.4,a,i2.2,a,i2.2,a,i3.3)') '======>> time-step =', kt,   &
+         IF(lwp .AND. nprint > 0) WRITE(numout,'(a,i8,a,i4.4,a,i2.2,a,i2.2,a,i3.3)') '======>> time-step =', kt,   &
               &   '      New day, DATE Y/M/D = ', nyear, '/', nmonth, '/', nday, '      nday_year = ', nday_year
-         IF(lwp) WRITE(numout,'(a,i8,a,i7,a,i5)') '         nsec_year = ', nsec_year,   &
+         IF(lwp .AND. nprint > 0) WRITE(numout,'(a,i8,a,i7,a,i5)') '         nsec_year = ', nsec_year,   &
               &   '   nsec_month = ', nsec_month, '   nsec_day = ', nsec_day, '   nsec_week = ', nsec_week
       ENDIF

NEMO/branches/2019/dev_r11756_text_output/src/SAS/nemogcm.F90

@@ -96 +96 @@
       CALL mpp_max( 'nemogcm', nstop )
 
-      IF(lwp) WRITE(numout,cform_aaa)   ! Flag AAAAAAA
+      IF(lwp .AND. nprint > 1) WRITE(numout,cform_aaa)   ! Flag AAAAAAA
 
       !                            !-----------------------!
@@ -148 +148 @@
       !                            !==  finalize the run  ==!
       !                            !------------------------!
-      IF(lwp) WRITE(numout,cform_aaa)        ! Flag AAAAAAA
+      IF(lwp .AND. nprint > 1) WRITE(numout,cform_aaa)        ! Flag AAAAAAA
       !
       IF( nstop /= 0 .AND. lwp ) THEN        ! error print
@@ -234 +234 @@
                      CALL ctl_opn( numnam_ref,        'namelist_sas_ref',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
                      CALL ctl_opn( numnam_cfg,        'namelist_sas_cfg',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
-         IF( lwm )   CALL ctl_opn(     numond, 'output.namelist_sas.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
+         IF( lwm .AND. nprint > 2 )   CALL ctl_opn(     numond, 'output.namelist_sas.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
       ELSE
          IF( lwm )   CALL ctl_opn(     numout,            'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
@@ -240 +240 @@
                      CALL ctl_opn( numnam_ref,            'namelist_ref',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
                      CALL ctl_opn( numnam_cfg,            'namelist_cfg',     'OLD', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
-         IF( lwm )   CALL ctl_opn(     numond,     'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
+         IF( lwm .AND. nprint > 2  )   CALL ctl_opn(     numond,     'output.namelist.dyn', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE. )
       ENDIF
       ! open /dev/null file to be able to supress output write easily
@@ -288 +288 @@
          WRITE(numout,*)
          !
-         WRITE(numout,cform_aaa)                                        ! Flag AAAAAAA
+         IF(nprint > 1) WRITE(numout,cform_aaa)                                        ! Flag AAAAAAA
          !
       ENDIF
@@ -305 +305 @@
       ENDIF
       !
-      IF(lwm) WRITE( numond, namctl )
+      IF(lwm .AND. nprint > 2) WRITE( numond, namctl )
       !
       !                             !------------------------------------!
@@ -324 +324 @@
       ENDIF
       !
-      IF(lwm)   WRITE( numond, namcfg )
+      nprint    = nn_print          ! convert DOCTOR namelist names into OLD names
+      !
+      IF(lwm .AND. nprint > 2)   WRITE( numond, namcfg )
       !
       !                             !-----------------------------------------!
@@ -362 +364 @@
                            CALL icb_init( rdt, nit000)   ! initialise icebergs instance
       !
-      IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA
+      IF(lwp .AND. nprint > 1) WRITE(numout,cform_aaa)           ! Flag AAAAAAA
       !
       IF( ln_timing    )   CALL timing_stop( 'nemo_init')
@@ -406 +408 @@
       ENDIF
       !
-      nprint    = nn_print          ! convert DOCTOR namelist names into OLD names
       nictls    = nn_ictls
       nictle    = nn_ictle

NEMO/branches/2019/dev_r11756_text_output/src/SAS/sbcssm.F90

@@ -192 +192 @@
       READ  ( numnam_cfg, namsbc_sas, IOSTAT = ios, ERR = 902 )
 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namsbc_sas in configuration namelist' )
-      IF(lwm) WRITE ( numond, namsbc_sas )
+      IF(lwm .AND. nprint > 2) WRITE ( numond, namsbc_sas )
       !           
       IF(lwp) THEN                              ! Control print