Changeset 10727 for utils/tools_AGRIF_CMEMS_2020/DOMAINcfg/src/domain.F90

Timestamp:

2019-02-27T17:02:02+01:00 (5 years ago)

Author:

rblod

Message:

new nesting tools (attempt) and brutal cleaning of DOMAINcfg, see ticket #2129

File:

• utils/tools_AGRIF_CMEMS_2020/DOMAINcfg/src/domain.F90 (moved) (moved from utils/tools_AGRIF_CMEMS_2020/DOMAINcfg/src/domain.f90) (11 diffs)

utils/tools_AGRIF_CMEMS_2020/DOMAINcfg/src/domain.F90

@@ -24 +24 @@
    USE dom_oce         ! domain: ocean
    USE phycst          ! physical constants
-   USE closea          ! closed seas
+ !  USE closea          ! closed seas
    USE domhgr          ! domain: set the horizontal mesh
    USE domzgr          ! domain: set the vertical mesh
-   USE domstp          ! domain: set the time-step
+ !  USE domstp          ! domain: set the time-step
    USE dommsk          ! domain: set the mask system
    USE domwri          ! domain: write the meshmask file
@@ -43 +43 @@
 
    PUBLIC   dom_init   ! called by opa.F90
+   PUBLIC   dom_nam  ! called by opa.F90
+   PUBLIC   cfg_write   ! called by opa.F90
 
    !!-------------------------------------------------------------------------
@@ -72 +74 @@
       !!----------------------------------------------------------------------
       !
-      IF( nn_timing == 1 )   CALL timing_start('dom_init')
+     ! IF( nn_timing == 1 )   CALL timing_start('dom_init')
       !
       IF(lwp) THEN
@@ -83 +85 @@
       !
                      CALL dom_nam               ! read namelist ( namrun, namdom )
-                     CALL dom_clo               ! Closed seas and lake
+                  !   CALL dom_clo               ! Closed seas and lake
+         
                      CALL dom_hgr               ! Horizontal mesh
                      CALL dom_zgr               ! Vertical mesh and bathymetry
@@ -135 +138 @@
       CALL cfg_write         ! create the configuration file
       !
-      IF( nn_timing == 1 )   CALL timing_stop('dom_init')
+    !  IF( nn_timing == 1 )   CALL timing_stop('dom_init')
       !
    END SUBROUTINE dom_init
@@ -156 +159 @@
          &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, nn_euler  ,     &
          &             ln_cfmeta, ln_iscpl
-      NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin, rn_isfhmin, &
+      NAMELIST/namdom/ nn_bathy, cn_topo, cn_bath, cn_lon, cn_lat, nn_interp,                        &
+         &             rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin, rn_isfhmin,           &
          &             rn_atfp , rn_rdt   , nn_closea   , ln_crs      , jphgr_msh ,                  &
          &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m,                         &
@@ -209 +213 @@
       ENDIF
 
-      no = nn_no                    ! conversion DOCTOR names into model names (this should disappear soon)
       cexper = cn_exp
       nrstdt = nn_rstctl
@@ -271 +274 @@
          WRITE(numout,*) '   Namelist namdom : space & time domain'
          WRITE(numout,*) '      flag read/compute bathymetry      nn_bathy     = ', nn_bathy
+         IF( nn_bathy == 2 ) THEN
+            WRITE(numout,*) '      compute bathymetry from file      cn_topo      = ', cn_topo
+         ENDIF   
          WRITE(numout,*) '      Depth (if =0 bathy=jpkm1)         rn_bathy     = ', rn_bathy
          WRITE(numout,*) '      min depth of the ocean    (>0) or    rn_hmin   = ', rn_hmin
@@ -331 +337 @@
       !!----------------------------------------------------------------------
       !
+#undef CHECK_DOM
+#ifdef CHECK_DOM
       IF(lk_mpp) THEN
          CALL mpp_minloc( e1t(:,:), tmask_i(:,:), ze1min, iimi1,ijmi1 )
@@ -364 +372 @@
          WRITE(numout,"(14x,'e2t mini: ',1f10.2,' at i = ',i5,' j= ',i5)") ze2min, iimi2, ijmi2
       ENDIF
+#endif
       !
    END SUBROUTINE dom_ctl
@@ -400 +409 @@
       !         
       clnam = 'domain_cfg'  ! filename (configuration information)
-      CALL iom_open( TRIM(clnam), inum, ldwrt = .TRUE., kiolib = jprstlib )
+      CALL iom_open( TRIM(clnam), inum, ldwrt = .TRUE.)!, kiolib = jprstlib )
       
       !