Changeset 8870 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90

Timestamp:

2017-12-01T10:48:12+01:00 (6 years ago)

Author:

deazer

Message:

Changed WAD option names to Iterative and Directional
Removed old Diagnostics
Updated Domain CFG to allow domain generation with ref height for wad cases
Cleaned up TEST_CASES/cfg.txt file (need to not include WAD2 etc)
TEST caaes run ok
SETTE runs OK
AMM15 5 level runs OK

File:

• branches/UKMO/ROMS_WAD_7832/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90 (modified) (3 diffs)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/TOOLS/DOMAINcfg/src/domain.f90

@@ -160 +160 @@
          &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m,                         &
          &             ppsur, ppa0, ppa1, ppkth, ppacr, ppdzmin, pphmax, ldbletanh,                  &
-         &             ppa2, ppkth2, ppacr2
+         &             ppa2, ppkth2, ppacr2, rn_wd_ref_depth, ln_wd
 
 
@@ -272 +272 @@
          WRITE(numout,*) '      flag read/compute bathymetry      nn_bathy     = ', nn_bathy
          WRITE(numout,*) '      Depth (if =0 bathy=jpkm1)         rn_bathy     = ', rn_bathy
+         WRITE(numout,*) '      WAD Domain?                       ln_wd        = ', ln_wd
+         WRITE(numout,*) '      WAD Reference depth)              rn_wd_ref_depth     = ', rn_wd_ref_depth
          WRITE(numout,*) '      min depth of the ocean    (>0) or    rn_hmin   = ', rn_hmin
          WRITE(numout,*) '      min number of ocean level (<0)       '
@@ -431 +433 @@
       IF( ln_isfcav ) THEN   ;   icav = 1   ;   ELSE   ;   icav = 0   ;   ENDIF
       CALL iom_rstput( 0, 0, inum, 'ln_isfcav', REAL( icav, wp), ktype = jp_i4 )
+      z2d(:,:) = hbatt(:,:) ! add back on reference height to get appox dep
+                                 !this is later corrected for with specified min depth bg user for above greoid
+                                 ! WAD points
+      !where (z2d   (:,:).lte.1e-5)  z2d(:,:) = -10.0
+      where (tmask  (:,:,1).eq.0)  z2d(:,:) = 0.0
+      IF( ln_wd ) THEN
+          CALL iom_rstput( 0, 0, inum, 'rn_wd_ref_depth'   , rn_wd_ref_depth  ) ! replace this later with variable
+          CALL iom_rstput( 0, 0, inum, 'ht_wd', z2d )        !    ht_wd
+      ENDIF
+
       !
       !                             !==  horizontal mesh  !