Changeset 8981 for branches/UKMO

Timestamp:

2017-12-11T18:38:08+01:00 (6 years ago)

Author:

deazer

Message:

Deal with rn_ssh_ref, this is not a namelist variable but read in from cfg file
change to ssh_ref, set to zero if no cfg file such as test cases
ht_wd_0 looks is obsolete.

Location:

branches/UKMO/ROMS_WAD_7832/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• CONFIG/TEST_CASES/WAD/MY_SRC/stpctl.F90 (deleted)
• CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified) (1 diff)
• CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/BDY/bdydyn2d.F90 (modified) (1 diff)
• NEMO/OPA_SRC/DIA/diawri.F90 (modified) (1 diff)
• NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (2 diffs)
• NEMO/OPA_SRC/DYN/wet_dry.F90 (modified) (4 diffs)
• NEMO/OPA_SRC/stpctl.F90 (modified) (2 diffs)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -75 +75 @@
       cn_domcfg = "domain_cfg"         ! domain configuration filename
       !
-   ln_write_cfg= .false.   !  (=T) create the domain configuration file
+   ln_write_cfg= .true.   !  (=T) create the domain configuration file
       cn_domcfg_out = "domain_cfg_out" ! newly created domain configuration filename
       !

branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90

@@ -170 +170 @@
       END SELECT
 
-! subtract the height of z=0 above the geoid (this allows z = 0 to be higher than all points that may become wet)   
-      pssh(:,:) = pssh(:,:)  - rn_ssh_ref
 
       !

branches/UKMO/ROMS_WAD_7832/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90

@@ -19 +19 @@
                       & mj0, mj1, glamt, gphit         ! ocean space and time domain
    USE usrdef_nam     ! User defined : namelist variables
-   USE wet_dry ,  ONLY: rn_wdmin1, rn_wdmin2, rn_wdld, &
-                      & rn_ht_0, rn_ssh_ref            ! Wetting and drying
+   USE wet_dry ,  ONLY: rn_wdmin1, rn_wdmin2, rn_wdld  ! Wetting and drying
    !
    USE in_out_manager ! I/O manager
@@ -234 +233 @@
       END IF
               
-! increase the depth of the bathymetry by rn_ssh_ref and rn_ht_0   
-      !zht(:,:) = zht(:,:) + rn_ssh_ref + rn_ht_0  
 
       ! at u-point: averaging zht

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/BDY/bdydyn2d.F90

@@ -171 +171 @@
          ij = idx%nbj(jb,igrd)
          IF( ll_wd ) THEN
-            spgu(ii, ij) = dta%ssh(jb)  - rn_ssh_ref 
+            spgu(ii, ij) = dta%ssh(jb)  - ssh_ref 
          ELSE
             spgu(ii, ij) = dta%ssh(jb)

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -155 +155 @@
 
       IF( ll_wd ) THEN
-         CALL iom_put( "ssh" , sshn+rn_ssh_ref )   ! sea surface height (brought back to the reference used for wetting and drying)
+         CALL iom_put( "ssh" , (sshn+ssh_ref)*tmask(:,:,1) )   ! sea surface height (brought back to the reference used for wetting and drying)
       ELSE
          CALL iom_put( "ssh" , sshn )              ! sea surface height

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -888 +888 @@
                ELSE
                   ! if not test case
-                  sshn(:,:) = -rn_ssh_ref
-                  sshb(:,:) = -rn_ssh_ref
+                  sshn(:,:) = -ssh_ref
+                  sshb(:,:) = -ssh_ref
 
                   DO jj = 1, jpj
                      DO ji = 1, jpi
-                        IF( ht_0(ji,jj)-rn_ssh_ref <  rn_wdmin1 ) THEN ! if total depth is less than min depth
+                        IF( ht_0(ji,jj)-ssh_ref <  rn_wdmin1 ) THEN ! if total depth is less than min depth
 
                            sshb(ji,jj) = rn_wdmin1 - (ht_0(ji,jj) )
@@ -905 +905 @@
                ! Adjust vertical metrics for all wad
                DO jk = 1, jpk
-                  e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) - rn_ht_0 + sshn(:,:)  ) &
+                  e3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:)  ) &
                     &                            / ( ht_0(:,:) + 1._wp - ssmask(:,:) ) * tmask(:,:,jk)   &
                     &            + e3t_0(:,:,jk) * ( 1._wp - tmask(:,:,jk) )

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -30 +30 @@
    USE usrdef_zgr     ! user defined vertical coordinate system
    USE depth_e3       ! depth <=> e3
-   USE wet_dry,   ONLY: ll_wd, rn_ssh_ref  ! Wetting and drying
+   USE wet_dry,   ONLY: ll_wd, ssh_ref  ! Wetting and drying
    !
    USE in_out_manager ! I/O manager
@@ -259 +259 @@
       !
       ! reference depth for negative bathy (wetting and drying only)
-      IF( ll_wd )  CALL iom_get( inum,  'rn_wd_ref_depth' , rn_ssh_ref   )
+      IF( ll_wd )  CALL iom_get( inum,  'rn_wd_ref_depth' , ssh_ref   )
       !
       CALL iom_close( inum )

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DYN/wet_dry.F90

@@ -48 +48 @@
                                       !: where the flow is from wet points on less than half the barotropic sub-steps  
    LOGICAL,  PUBLIC  ::  ln_wd_dl_rmp !: use a ramp for the dl flux limiter between 2 rn_wdmin1 and rn_wdmin1 (rather than a cut-off at rn_wdmin1)      
-   REAL(wp), PUBLIC  ::   rn_ssh_ref  !: height of z=0 with respect to the geoid; 
-   REAL(wp), PUBLIC  ::   rn_ht_0     !: the height at which ht_0 = 0   
+   REAL(wp), PUBLIC  ::   ssh_ref     !: height of z=0 with respect to the geoid; 
 
    LOGICAL,  PUBLIC  ::   ll_wd       !: Wetting/drying activation switch if either ln_wd_il or ln_wd_dl
@@ -70 +69 @@
       !!----------------------------------------------------------------------
       NAMELIST/namwad/ ln_wd_il, ln_wd_dl, rn_wdmin0, rn_wdmin1, rn_wdmin2, rn_wdld, &
-                     & nn_wdit, ln_wd_dl_bc, ln_wd_dl_rmp, rn_ht_0
+                     & nn_wdit, ln_wd_dl_bc, ln_wd_dl_rmp
 
       INTEGER  ::   ios                 ! Local integer output status for namelist read
@@ -100 +99 @@
          WRITE(numout,*) '      T => baroclinic u,v=0 at dry pts: ln_wd_dl_bc = ', ln_wd_dl_bc     
          WRITE(numout,*) '      use a ramp for rwd limiter:  ln_wd_dl_rwd_rmp = ', ln_wd_dl_rmp
-         WRITE(numout,*) '      the height (z) at which ht_0=0:  rn_ht_0      = ', rn_ht_0  
+ 
       ENDIF
+      IF( .NOT. ln_read_cfg ) THEN
+         WRITE(numout,*) '      No configuration file so seting ssh_ref to zero  '
+          ssh_ref=0.0
+      ENDIF
+
       r_rn_wdmin1=1/rn_wdmin1
       ll_wd = .FALSE.
@@ -178 +182 @@
 
             IF( tmask(ji, jj, 1) < 0.5_wp ) CYCLE              ! we don't care about land cells
-            IF( ht_0(ji,jj) - rn_ssh_ref > zdepwd ) CYCLE   ! and cells which are unlikely to dry
+            IF( ht_0(ji,jj) - ssh_ref > zdepwd ) CYCLE   ! and cells which are unlikely to dry
 
             zflxp(ji,jj) = max(zflxu(ji,jj), 0._wp) - min(zflxu(ji-1,jj),   0._wp) + &

branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/stpctl.F90

@@ -22 +22 @@
    USE lib_mpp         ! distributed memory computing
    USE lib_fortran     ! Fortran routines library 
-   USE wet_dry,    ONLY: ll_wd, rn_ssh_ref    ! reference depth for negative bathy
+   USE wet_dry,    ONLY: ll_wd, ssh_ref    ! reference depth for negative bathy
 
    IMPLICIT NONE
@@ -152 +152 @@
          DO ji = 1, jpi
             IF( ll_wd ) THEN
-               IF( tmask(ji,jj,1) == 1) zsshmax = MAX( zsshmax, ABS(sshn(ji,jj)+rn_ssh_ref) )
+               IF( tmask(ji,jj,1) == 1) zsshmax = MAX( zsshmax, ABS(sshn(ji,jj)+ssh_ref) )
             ELSE
                IF( tmask(ji,jj,1) == 1) zsshmax = MAX( zsshmax, ABS(sshn(ji,jj)) )