Changeset 9033 for branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg

Timestamp:

2017-12-14T11:29:10+01:00 (6 years ago)

Author:

timgraham

Message:

Commit final files from merge of NEMOGCM and some fixes for waves (taooc renamed tauwoc)

Location:

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg

Files:

• namelist_cfg (modified) (1 diff)
• namelist_ref (modified) (1 diff)
• src/dom_oce.f90 (modified) (1 diff)
• src/domain.f90 (modified) (3 diffs)
• src/domzgr.f90 (modified) (1 diff)

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_cfg

@@ -58 +58 @@
    ppkth2      =  999999.              !
    ppacr2      =  999999.              !
+   rn_wd_ref_depth   =    0.0          !  Reference Depth for WAD cases (0 all other cases)
 /
 !-----------------------------------------------------------------------

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/namelist_ref

@@ -170 +170 @@
    ppkth2      =       48.029893720000 !
    ppacr2      =       13.000000000000 !
-/
-!-----------------------------------------------------------------------
-&namwad        !   Wetting and drying                                   (default F)
-!-----------------------------------------------------------------------
-   ln_wd       = .false.   !  T/F activation of wetting and drying
-   rn_wdmin1   =  0.1      !  Minimum wet depth on dried cells
-   rn_wdmin2   =  0.01     !  Tolerance of min wet depth on dried cells
-   rn_wdld     =  20.0     !  Land elevation below which wetting/drying is allowed
-   nn_wdit     =  10       !  Max iterations for W/D limiter
+   ln_wd       =             .false.   !  T/F activation of wetting and drying
+   rn_wd_ref_depth   =    0.0          !  Reference Depth for WAD cases (0 all other cases)
 /
 !-----------------------------------------------------------------------

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/dom_oce.f90

@@ -31 +31 @@
    !                                    !!* Namelist namdom : time & space domain *
    INTEGER , PUBLIC ::   nn_bathy        !: = 0/1 ,compute/read the bathymetry file
+   LOGICAL   PUBLIC ::   ln_wd           !: Is it a WAD domain? T/F Default T
+   REAL(wp), PUBLIC ::   rn_wd_ref_depth !: Reference depth for Wet and Dry
    REAL(wp), PUBLIC ::   rn_bathy        !: depth of flat bottom (active if nn_bathy=0; if =0 depth=jpkm1)
    REAL(wp), PUBLIC ::   rn_hmin         !: minimum ocean depth (>0) or minimum number of ocean levels (<0)

branches/2017/dev_merge_2017/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  !

branches/2017/dev_merge_2017/NEMOGCM/TOOLS/DOMAINcfg/src/domzgr.f90

@@ -1957 +1957 @@
          WRITE(numout,*) '        Bottom cell (Zb) (m) = H*rn_zb_a + rn_zb_b'
       ENDIF
-
+      ! CEOD
+      ! Add on some reference level to make nagative bathy positive to create
+      ! sensible e3t_0's
+! Can used commented code here to force bathy near open bdy not to have any WAD
+! points
+
+!CEOD MAKE points on the perimeter assuming a bondary is here on shallower than
+!10m so that tide can be specified here.
+!      DO jj = 1, jpj
+!         DO ji = 1, jpi
+!            !CEODIF( mig(ji) <= 2 .or. mjg(jj) <= 2  .or. mig(ji) >= jpiglo-2 .or.  mjg(jj) >=jpjglo-2) then
+!            IF( mig(ji) <= 10   .or. mjg(jj) <=10  .or.  mjg(ji) >=jpiglo-10+1 .or. mjg(jj) >=jpjglo-10+1   ) then
+!               IF( bathy(ji,jj) + rn_wd_ref_depth  > 0.0)   then
+!                  bathy(ji,jj) = max(5.0,bathy(ji,jj)) !
+!               ENDIF
+!               IF( bathy(ji,jj)  + rn_wd_ref_depth   <= 0.0)   then
+!                  bathy(ji,jj) =  -rn_wd_ref_depth*2._wp ! Make sure it is land
+!               ENDIF
+!            ENDIF
+!         END DO
+!      END DO
+
+      IF( ln_wd) THEN
+         bathy(:,:) = bathy(:,:) + rn_wd_ref_depth !  Arbitrary reference level for WAD, This needs
+      ELSE
+         bathy(:,:) = bathy(:,:)  !  Arbitrary reference level for WAD, This needs
+      ENDIF
+                                                !  to be accounted for in istate in the actual model and bdys etc.
       hift(:,:) = rn_sbot_min                     ! set the minimum depth for the s-coordinate
       hifu(:,:) = rn_sbot_min