Changeset 13024 for utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/domain.F90

Timestamp:

2020-06-03T16:26:23+02:00 (4 years ago)

Author:

rblod

Message:

First version of new nesting tools merged with domaincfg, see ticket #2129

File:

• utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/domain.F90 (modified) (8 diffs)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/domain.F90

@@ -62 +62 @@
       !!              - 1D configuration, move Coriolis, u and v at T-point
       !!----------------------------------------------------------------------
+      INTEGER ::   jk          ! dummy loop indices
+      INTEGER ::   iconf = 0   ! local integers
+      REAL(wp), POINTER, DIMENSION(:,:) ::   z1_hu_0, z1_hv_0
+      INTEGER , DIMENSION(jpi,jpj) ::   ik_top , ik_bot       ! top and bottom ocean level
+      !!----------------------------------------------------------------------
+      !
+     ! IF( nn_timing == 1 )   CALL timing_start('dom_init')
       !
       IF(lwp) THEN
@@ -71 +78 @@
       !                       !==  Reference coordinate system  ==!
       !
-      CALL dom_nam                  ! read namelist ( namrun, namdom )
-      !
-      CALL dom_hgr                  ! Horizontal mesh
-      !
-      CALL dom_zgr                  ! Vertical mesh and bathymetry
-      !
-      CALL dom_msk                  ! compute mask (needed by write_cfg)
-      !
-      IF ( ln_domclo ) CALL dom_clo ! Closed seas and lake
+      CALL dom_nam               ! read namelist ( namrun, namdom )
+                  !   CALL dom_clo               ! Closed seas and lake
+         
+      CALL dom_hgr               ! Horizontal mesh
+      CALL dom_zgr( ik_top, ik_bot )  ! Vertical mesh and bathymetry
+      CALL dom_msk( ik_top, ik_bot )  ! Masks
+      !
       !
       CALL dom_ctl                  ! print extrema of masked scale factors
       ! 
+#if ! defined key_agrif
       CALL cfg_write                ! create the configuration file
+#endif
       !
    END SUBROUTINE dom_init
@@ -103 +110 @@
          &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, nn_euler  ,     &
          &             ln_cfmeta, ln_iscpl
-      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_atfp , rn_rdt   , ln_crs      , jphgr_msh ,                                &
+  !    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_atfp , rn_rdt   , ln_crs      , jphgr_msh ,                                &
+  !       &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m,                         &
+  !       &             ppsur, ppa0, ppa1, ppkth, ppacr, ppdzmin, pphmax, ldbletanh,                  &
+  !       &             ppa2, ppkth2, ppacr2
+
+      NAMELIST/namdom/ nn_bathy, cn_topo, cn_bath, cn_lon, cn_lat, rn_scale, nn_interp, &
+         &              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,                         &
          &             ppsur, ppa0, ppa1, ppkth, ppacr, ppdzmin, pphmax, ldbletanh,                  &
          &             ppa2, ppkth2, ppacr2
-
-
 
       INTEGER  ::   ios                 ! Local integer output status for namelist read
@@ -181 +193 @@
 
 
-
+      ! 
+      cn_topo =''
+      cn_bath =''
+      cn_lon  =''
+      cn_lat  =''
+      rn_scale = 1.
 
       REWIND( numnam_ref )              ! Namelist namdom in reference namelist : space & time domain (bathymetry, mesh, timestep)
@@ -193 +210 @@
       IF(lwm) WRITE ( numond, namdom )
       !
+
+
+
       IF(lwp) THEN
          WRITE(numout,*)
@@ -198 +218 @@
          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
+            WRITE(numout,*) '   compute bathymetry from file      cn_topo      = ' , cn_topo
+            WRITE(numout,*) '   bathymetry name in file           cn_bath      = ' , cn_bath
+            WRITE(numout,*) '   longitude name in file            cn_lon       = ' , cn_lon
+            WRITE(numout,*) '   latitude  name in file            cn_lat       = ' , cn_lat
+            WRITE(numout,*) '   bathmetry scale factor            rn_scale     = ' , rn_scale 
          ENDIF   
          WRITE(numout,*) '      Depth (if =0 bathy=jpkm1)         rn_bathy     = ', rn_bathy
@@ -255 +279 @@
       !!----------------------------------------------------------------------
       !
+#undef CHECK_DOM
+#ifdef CHECK_DOM
       IF(lk_mpp) THEN
          CALL mpp_minloc( 'dom_ctl', e1t(:,:), tmask_i(:,:), ze1min, iloc )
@@ -292 +318 @@
          WRITE(numout,"(14x,'e2t mini: ',1f10.2,' at i = ',i5,' j= ',i5)") ze2min, iimi2, ijmi2
       ENDIF
+#endif
       !
       ! check that all processes are still there... If some process have an error,