Changeset 13390 for utils/tools/DOMAINcfg/src

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.

Location:

utils/tools/DOMAINcfg/src

Files:

• dom_doc.f90 (copied) (copied from utils/tools_ticket2502/DOMAINcfg/src/dom_doc.f90)
• dom_oce.F90 (modified) (1 diff)
• domain.F90 (modified) (3 diffs)
• domhgr.F90 (modified) (1 diff)
• domzgr.F90 (modified) (3 diffs)

utils/tools/DOMAINcfg/src/dom_oce.F90

@@ -45 +45 @@
    INTEGER, PUBLIC :: nn_interp
    CHARACTER(LEN=200), PUBLIC :: cn_topo
+   CHARACTER(LEN=200), PUBLIC :: cn_topolvl
+   CHARACTER(LEN=200), PUBLIC :: cn_fisfd
    CHARACTER(LEN=132), PUBLIC :: cn_bath
+   CHARACTER(LEN=132), PUBLIC :: cn_bathlvl
+   CHARACTER(LEN=132), PUBLIC :: cn_visfd
+   CHARACTER(LEN=132), PUBLIC :: cn_fcoord
    CHARACTER(LEN=132), PUBLIC :: cn_lon
    CHARACTER(LEN=132), PUBLIC :: cn_lat

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

utils/tools/DOMAINcfg/src/domhgr.F90

@@ -465 +465 @@
          coordinate_filename=TRIM(cn_domcfg)
       ELSE
-         coordinate_filename='coordinates'
+         coordinate_filename=cn_fcoord
       ENDIF
       CALL iom_open( coordinate_filename, inum )

utils/tools/DOMAINcfg/src/domzgr.F90

@@ -676 +676 @@
          !
          IF( ln_zco )   THEN                          ! zco : read level bathymetry 
-            CALL iom_open ( 'bathy_level.nc', inum )  
-            CALL iom_get  ( inum, jpdom_data, 'Bathy_level', bathy )
+            CALL iom_open ( cn_topolvl, inum )  
+            CALL iom_get  ( inum, jpdom_data, cn_bathlvl, bathy )
             CALL iom_close( inum )
             mbathy(:,:) = INT( bathy(:,:) )
@@ -714 +714 @@
 #endif
             IF( ntopo == 1) THEN
-               CALL iom_open ( 'bathy_meter.nc', inum ) 
-               IF ( ln_isfcav ) THEN
-                  CALL iom_get  ( inum, jpdom_data, 'Bathymetry_isf', bathy, lrowattr=.false. )
-               ELSE
-                  CALL iom_get  ( inum, jpdom_data, 'Bathymetry'    , bathy, lrowattr=ln_use_jattr  )
-               END IF
+               CALL iom_open ( cn_topo, inum ) 
+               CALL iom_get  ( inum, jpdom_data, cn_bath, bathy, lrowattr=ln_use_jattr  )
                CALL iom_close( inum )
             ELSE
@@ -738 +734 @@
             !
             IF ( ln_isfcav ) THEN
-               CALL iom_open ( 'isf_draft_meter.nc', inum ) 
-               CALL iom_get  ( inum, jpdom_data, 'isf_draft', risfdep )
+               CALL iom_open ( cn_fisfd, inum ) 
+               CALL iom_get  ( inum, jpdom_data, cn_visfd, risfdep )
                CALL iom_close( inum )
             END IF