Changeset 11129 for NEMO/branches/2019/ENHANCE-03_domcfg/src/nemogcm.F90

Timestamp:

2019-06-18T17:11:36+02:00 (5 years ago)

Author:

mathiot

Message:

simplification of domcfg (rm all var_n and var_b as it is not needed) (ticket #2143)

Location:

NEMO/branches/2019/ENHANCE-03_domcfg

Files:

• . (copied) (copied from utils/tools_AGRIF_CMEMS_2020/DOMAINcfg)
• src/nemogcm.F90 (modified) (7 diffs)

NEMO/branches/2019/ENHANCE-03_domcfg/src/nemogcm.F90

@@ -44 +44 @@
    !!   factorise     : calculate the factors of the no. of MPI processes
    !!----------------------------------------------------------------------
-   USE step_oce       ! module used in the ocean time stepping module (step.F90)
+   USE dom_oce        ! ocean space and time domain variables
+   USE in_out_manager ! I/O manager
+   USE iom            !
    USE domcfg         ! domain configuration               (dom_cfg routine)
    USE mppini         ! shared/distributed memory setting (mpp_init routine)
@@ -97 +99 @@
       CALL nemo_init               !==  Initialisations  ==!
       !                            !-----------------------!
+      PRINT *, 'end nemo init'
 
 #if defined key_agrif    
@@ -126 +129 @@
       !
       !
+      PRINT *, 'close file'
       CALL nemo_closefile
+      PRINT *, 'The end'
       !
       !
@@ -141 +146 @@
       INTEGER  ::   ios, ilocal_comm   ! local integers
       CHARACTER(len=120), DIMENSION(60) ::   cltxt, cltxt2, clnam
-       !
-      NAMELIST/namctl/ ln_ctl   , sn_cfctl, nn_print,ln_timing
+      !!
+      NAMELIST/namctl/ ln_ctl   , sn_cfctl, nn_print, nn_ictls, nn_ictle,   &
+         &             nn_isplt , nn_jsplt, nn_jctls, nn_jctle,             &
+         &             ln_timing, ln_diacfl
       NAMELIST/namcfg/ ln_e3_dep,                                &
          &             cp_cfg, cp_cfz, jp_cfg, jpidta, jpjdta, jpkdta, jpiglo, jpjglo, &
@@ -154 +161 @@
       CALL ctl_opn( numnam_cfg, 'namelist_cfg', 'OLD', 'FORMATTED', 'SEQUENTIAL', -1, 6, .FALSE. )
       !
-      REWIND( numnam_ref )              ! Namelist namctl in reference namelist : Control prints & Benchmark
+      REWIND( numnam_ref )              ! Namelist namctl in reference namelist
       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 & Benchmark
+901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namctl in reference namelist', .TRUE. )
+      REWIND( numnam_cfg )              ! Namelist namctl in confguration namelist
       READ  ( numnam_cfg, namctl, IOSTAT = ios, ERR = 902 )
-      902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. )
-
-      !
-      REWIND( numnam_ref )              ! Namelist namcfg in reference namelist : Control prints & Benchmark
+902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namctl in configuration namelist', .TRUE. )
+      !
+      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 : Control prints & Benchmark
+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. )   
+904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namcfg in configuration namelist', .TRUE. )   
 
 ! Force values for AGRIF zoom (cf. agrif_user.F90)
@@ -265 +269 @@
                             CALL     dom_cfg    ! Domain configuration
                             CALL     dom_init   ! Domain
-      IF( ln_ctl        )   CALL prt_ctl_init   ! Print control
       !
    END SUBROUTINE nemo_init
@@ -409 +412 @@
       !!----------------------------------------------------------------------
       !
-      ierr =        oce_alloc       ()          ! ocean
-      ierr = ierr + dom_oce_alloc   ()          ! ocean domain
+      ierr = dom_oce_alloc   ()          ! ocean domain
       !
       CALL mpp_sum( 'nemogcm', ierr )