Changeset 7246 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC

Timestamp:

2016-11-17T11:56:41+01:00 (8 years ago)

Author:

flavoni

Message:

fix warning on out parameter domainÂ_cfg, and namelists for agrif

Location:

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC

Files:

• DOM/domain.F90 (modified) (3 diffs)
• nemogcm.F90 (modified) (1 diff)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -493 +493 @@
 
 
-   SUBROUTINE domain_cfg( ldtxt, ldnam, cd_cfg, kk_cfg, kpi, kpj, kpk, kperio )
+   SUBROUTINE domain_cfg( ldtxt, cd_cfg, kk_cfg, kpi, kpj, kpk, kperio )
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE dom_nam  ***
@@ -502 +502 @@
       !!
       !!----------------------------------------------------------------------
-      CHARACTER(len=*), DIMENSION(:), INTENT(out) ::   ldtxt, ldnam    ! stored print information
+      CHARACTER(len=*), DIMENSION(:), INTENT(out) ::   ldtxt           ! stored print information
       CHARACTER(len=*)              , INTENT(out) ::   cd_cfg          ! configuration name
       INTEGER                       , INTENT(out) ::   kk_cfg          ! configuration resolution
@@ -536 +536 @@
       ENDIF
       !
-      CALL iom_get( inum, 'jpiglo', ziglo  )   ;   jpiglo = INT( ziglo )
-      CALL iom_get( inum, 'jpjglo', zjglo  )   ;   jpjglo = INT( zjglo )
-      CALL iom_get( inum, 'jpkglo', zkglo  )   ;   jpkglo = INT( zkglo )
-      CALL iom_get( inum, 'jperio', zperio )   ;   jperio = INT( zperio )
+      CALL iom_get( inum, 'jpiglo', ziglo  )   ;   kpi = INT( ziglo )
+      CALL iom_get( inum, 'jpjglo', zjglo  )   ;   kpj = INT( zjglo )
+      CALL iom_get( inum, 'jpkglo', zkglo  )   ;   kpk = INT( zkglo )
+      CALL iom_get( inum, 'jperio', zperio )   ;   kperio = INT( zperio )
       CALL iom_close( inum )
       !
       WRITE(ldtxt(ii),*) '   cn_cfg = ', TRIM(cd_cfg), '   nn_cfg = ', kk_cfg             ;   ii = ii+1
-      WRITE(ldtxt(ii),*) '   jpiglo = ', jpiglo                                           ;   ii = ii+1
-      WRITE(ldtxt(ii),*) '   jpjglo = ', jpjglo      , '   jpkglo = ', jpkglo             ;   ii = ii +1
-      WRITE(ldtxt(ii),*) '   jpkglo = ', jpkglo                                           ;   ii = ii +1
-      WRITE(ldtxt(ii),*) '   type of global domain lateral boundary   jperio = ', jperio  ;   ii = ii +1
+      WRITE(ldtxt(ii),*) '   jpiglo = ', kpi                                              ;   ii = ii+1
+      WRITE(ldtxt(ii),*) '   jpjglo = ', kpj                                              ;   ii = ii+1
+      WRITE(ldtxt(ii),*) '   jpkglo = ', kpk                                              ;   ii = ii+1
+      WRITE(ldtxt(ii),*) '   type of global domain lateral boundary   jperio = ', kperio  ;   ii = ii+1
       !        
    END SUBROUTINE domain_cfg

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

@@ -275 +275 @@
       !                             !--------------------------!
       IF( ln_read_cfg ) THEN              ! Read sizes in domain configuration file
-         CALL domain_cfg ( cltxt2, clnam, cn_cfg, nn_cfg, jpiglo, jpjglo, jpkglo, jperio )
+         CALL domain_cfg ( cltxt2,      , cn_cfg, nn_cfg, jpiglo, jpjglo, jpkglo, jperio )
          !
       ELSE                                ! user-defined namelist