Changeset 13390 for utils/tools/DOMAINcfg/src/domain.F90

Timestamp:

2020-08-10T11:09:15+02:00 (4 years ago)

Author:

mathiot

Message:

ticket #2502: merge ticket branch into trunk. DOMAIN_cfg namelist contains now fields to specify input files names (bathy meter and level files, coord file, isf draft meter and level files), save it into the netcdf (dom_doc.exe) and re-generate the namelist if needed (xtrac_namelist.bash). The usage is documented in the DOMAIN_cfg README.rst.

File:

• utils/tools/DOMAINcfg/src/domain.F90 (modified) (3 diffs)

utils/tools/DOMAINcfg/src/domain.F90

@@ -109 +109 @@
 
       NAMELIST/namdom/ ln_read_cfg, nn_bathy, cn_domcfg, cn_topo, cn_bath, cn_lon, cn_lat, rn_scale, nn_interp, &
-         &              rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,            &
+         &             cn_topolvl, cn_fisfd, cn_visfd, cn_bathlvl, cn_fcoord,                       & 
+         &             rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,                       &
          &             rn_atfp , rn_rdt   ,  ln_crs      , jphgr_msh ,                               &
          &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m,                         &
@@ -169 +170 @@
          WRITE(numout,*) '   Namelist namdom : space & time domain'
          WRITE(numout,*) '      flag read/compute bathymetry      nn_bathy     = ', nn_bathy
-         IF( nn_bathy == 2 ) THEN
+         IF( nn_bathy == 1 ) THEN
+            WRITE(numout,*) '   read bathymetry from file      cn_topo      = ' ,TRIM(cn_topo)
+            WRITE(numout,*) '   bathymetry name in file        cn_bath      = ' ,TRIM(cn_bath)
+            WRITE(numout,*) '   read isf draft from file       cn_fisfd     = ' ,TRIM(cn_fisfd)
+            WRITE(numout,*) '   isf draft name in file         cn_visfd     = ' ,TRIM(cn_visfd)
+         ELSE IF( nn_bathy == 2 ) THEN
             WRITE(numout,*) '   compute bathymetry from file      cn_topo      = ' , cn_topo
             WRITE(numout,*) '   bathymetry name in file           cn_bath      = ' , cn_bath
@@ -435 +441 @@
    END SUBROUTINE cfg_write
 
-
-
    !!======================================================================
 END MODULE domain