Changeset 7188 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2016-11-04T06:54:44+01:00 (7 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: e3.=dk[dep.] (discret derivative)

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (6 diffs)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -239 +239 @@
       INTEGER  ::   ios, inum     !   -      -
       REAL(wp) ::   ziglo, zjglo, zkglo, zperio   ! local scalars
-      CHARACTER(len=120), DIMENSION(30) ::   cltxt, cltxt2, clnam, clbug
-      !
-      NAMELIST/namctl/ ln_ctl  , nn_print, nn_ictls, nn_ictle,   &
-         &             nn_isplt, nn_jsplt, nn_jctls, nn_jctle,   &
+      CHARACTER(len=120), DIMENSION(30) ::   cltxt, cltxt2, clnam
+      !
+      NAMELIST/namctl/ ln_ctl   , nn_print, nn_ictls, nn_ictle,   &
+         &             nn_isplt , nn_jsplt, nn_jctls, nn_jctle,   &
          &             nn_timing, nn_diacfl
       NAMELIST/namcfg/ ln_read_cfg, ln_write_cfg, cp_cfg, jp_cfg, ln_use_jattr
@@ -250 +250 @@
       cltxt2 = ''
       clnam  = ''  
-      clbug  = ''
       cxios_context = 'nemo'
       !
@@ -257 +256 @@
       CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
       !
-
-!!gm      WRITE(clbug(1),*) ' before namelist / namctl read    nstop', nstop      
-
       REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints
       READ  ( numnam_ref, namctl, IOSTAT = ios, ERR = 901 )
 901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in reference namelist', .TRUE. )
-
+      !
       REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist : Control prints
       READ  ( numnam_cfg, namctl, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. )
-
-
-!!gm      WRITE(clbug(2),*) ' before namelist namcfg read    nstop', nstop      
-
       !
       REWIND( numnam_ref )              ! Namelist namcfg in reference namelist
       READ  ( numnam_ref, namcfg, IOSTAT = ios, ERR = 903 )
 903   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in reference namelist', .TRUE. )
-
+      !
       REWIND( numnam_cfg )              ! Namelist namcfg in confguration namelist
       READ  ( numnam_cfg, namcfg, IOSTAT = ios, ERR = 904 )
 904   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )   
 
-!!gm      WRITE(clbug(3),*) ' after namelist namcfg read    nstop', nstop
-
       !                             !--------------------------!
       !                             !  Set global domain size  !   (control print return in cltxt2)
       !                             !--------------------------!
-      IF( ln_read_cfg ) THEN              ! Read sizes in configuration "mesh_mask" file
+      IF( ln_read_cfg ) THEN              ! Read sizes in configuration "domain_cfg" file
          CALL iom_open( 'domain_cfg', inum )
          CALL iom_get( inum, 'jpiglo', ziglo  )   ;   jpiglo = INT( ziglo )
@@ -292 +282 @@
          CALL iom_get( inum, 'jperio', zperio )   ;   jperio = INT( zperio )
          CALL iom_close( inum )
-         WRITE(cltxt2(1),*) '~~~~~~~~~~   '      
-         WRITE(cltxt2(2),*) 'domain_cfg : domain size read in "domain_cfg" file : jp(i,j,k)glo = '
-         WRITE(cltxt2(3),*) '            ', jpiglo, jpjglo, jpkglo        
-         WRITE(cltxt2(1),*) '~~~~~~~~~~   lateral boudary type of the global domain jperio= ', jperio
+         WRITE(cltxt2(1),*) ' '      
+         WRITE(cltxt2(2),*) 'domain_cfg : domain size read in "domain_cfg" file '         
+         WRITE(cltxt2(3),*) '~~~~~~~~~~    '
+         WRITE(cltxt2(4),*) '   jpiglo = ', jpiglo, ' jpjglo = ', jpjglo,  ' jpkglo = ', jpkglo
+         WRITE(cltxt2(5),*) '   global domain type of lateral boundary   jperio = ', jperio
          !        
       ELSE                                ! user-defined namelist
@@ -404 +395 @@
          !
 
-         DO ji = 1, SIZE(clbug)
-            IF( TRIM(clbug (ji)) /= '' )   WRITE(numout,*) clbug(ji)      ! bug print 
-         END DO
-         WRITE(numout,*)
-
-
-
 
          WRITE(numout,*)
@@ -425 +409 @@
          WRITE(numout,*)
          DO ji = 1, SIZE(cltxt2)
-!            IF( TRIM(cltxt2(ji)) /= '' )   WRITE(numout,*) cltxt2(ji)     ! control print of domain size
             IF( cltxt2(ji) /= '' )   WRITE(numout,*) cltxt2(ji)     ! control print of domain size
          END DO