Changeset 9017 for branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2017-12-13T15:37:41+01:00 (7 years ago)

Author:

davestorkey

Message:

UKMO/dev_r8600_closea_rewrite branch : commit code

File:

• branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) (4 diffs)

branches/UKMO/dev_r8600_closea_rewrite/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -30 +30 @@
    USE trc_oce        ! shared ocean & passive tracers variab
    USE phycst         ! physical constants
-   USE usrdef_closea  ! closed seas
+   USE closea         ! closed seas
    USE domhgr         ! domain: set the horizontal mesh
    USE domzgr         ! domain: set the vertical mesh
@@ -128 +128 @@
       CALL dom_glo                     ! global domain versus local domain
       CALL dom_nam                     ! read namelist ( namrun, namdom )
-      CALL dom_clo( cn_cfg, nn_cfg )   ! Closed seas and lake
       CALL dom_hgr                     ! Horizontal mesh
       CALL dom_zgr( ik_top, ik_bot )   ! Vertical mesh and bathymetry
-      IF( nn_closea == 0 )   CALL clo_bat( ik_top, ik_bot )    !==  remove closed seas or lakes  ==!
+      IF( ln_closea ) THEN    
+          CALL dom_clo( ik_bot )  ! Closed seas and lake 
+          IF( nn_closea == 0 )   CALL clo_bat( ik_top, ik_bot )    !==  remove closed seas or lakes  ==!
+      ENDIF
       CALL dom_msk( ik_top, ik_bot )   ! Masks
       !
@@ -286 +288 @@
          &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, nn_euler  ,     &
          &             ln_cfmeta, ln_iscpl
-      NAMELIST/namdom/ ln_linssh, nn_closea, nn_msh, rn_isfhmin, rn_rdt, rn_atfp, ln_crs
+      NAMELIST/namdom/ ln_linssh, ln_closea, nn_closea, nn_msh, rn_isfhmin, rn_rdt, rn_atfp, ln_crs
 #if defined key_netcdf4
       NAMELIST/namnc4/ nn_nchunks_i, nn_nchunks_j, nn_nchunks_k, ln_nc4zip
@@ -395 +397 @@
          WRITE(numout,*) '   Namelist namdom : space & time domain'
          WRITE(numout,*) '      linear free surface (=T)              ln_linssh  = ', ln_linssh
-         WRITE(numout,*) '      suppression of closed seas (=0)       nn_closea  = ', nn_closea
+         WRITE(numout,*) '      special treatment of closed seas      ln_closea  = ', ln_closea
+         IF(ln_closea) WRITE(numout,*) '      suppression of closed seas (=0)       nn_closea  = ', nn_closea
          WRITE(numout,*) '      create mesh/mask file(s)              nn_msh     = ', nn_msh
          WRITE(numout,*) '           = 0   no file created           '