Changeset 8981 for branches/UKMO/ROMS_WAD_7832/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2017-12-11T18:38:08+01:00 (7 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/NEMO/OPA_SRC/DOM

Files:

• domvvl.F90 (modified) (2 diffs)
• domzgr.F90 (modified) (2 diffs)

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 )