Changeset 15458 for NEMO

Timestamp:

2021-10-28T17:12:05+02:00 (3 years ago)

Author:

clem

Message:

4.0-HEAD: recalculate vertical scale factors in istate.F90 for wetting and drying and user defined configurations (related to change of ssh). Should solve ticket #2736 for 4.0. Not sure we also need to change the trunk?

Location:

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DOM

Files:

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

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DOM/domvvl.F90

@@ -131 +131 @@
       e3t_a(:,:,jpk) = e3t_0(:,:,jpk)  ! last level always inside the sea floor set one for all
       !
+      !                    !== Set of all other vertical scale factors  ==!  (now and before)
       CALL dom_vvl_zgr
       !
@@ -960 +961 @@
 !               DO jk=1,jpk
 !                  e3t_b(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshb(:,:) ) &
-!                     &            / ( ht_0(:,:) + 1._wp -ssmask(:,:) ) * tmask(:,:,jk)
+!                     &                           / ( ht_0(:,:) + 1._wp -ssmask(:,:) ) * tmask(:,:,jk)
+!                    &            + e3t_0(:,:,jk) * ( 1._wp - tmask(:,:,jk) )   ! make sure e3t_b != 0 on land points
 !               END DO
 !               e3t_n(:,:,:) = e3t_b(:,:,:)

NEMO/releases/r4.0/r4.0-HEAD/src/OCE/DOM/istate.F90

@@ -60 +60 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:,:) ::   zuvd    ! U & V data workspace
 !!gm end
+      REAL(wp), DIMENSION(jpi,jpj) ::   z2d    ! temporary array
       !!----------------------------------------------------------------------
       !
@@ -110 +111 @@
                      ENDIF
                   END DO
-               END DO 
+               END DO
+               !
+               IF( .NOT.ln_linssh ) THEN      ! adjust initial vertical scale factors
+                  sshn(:,:) = sshb(:,:)
+                  z2d (:,:) = 1._wp + sshn(:,:) * ssmask(:,:) / ( ht_0(:,:) + 1._wp - ssmask(:,:) )
+                  DO jk = 1, jpkm1                
+                     DO jj = 1, jpj
+                        DO ji = 1, jpi
+                           IF( ht_0(ji,jj) + sshb(ji,jj)  < rn_wdmin1 ) THEN
+                              e3t_n(ji,jj,jk) = e3t_0(ji,jj,jk) * ( z2d(ji,jj) * tmask(ji,jj,jk) - ( tmask(ji,jj,jk) - 1._wp ) )
+                              e3t_b(ji,jj,jk) = e3t_n(ji,jj,jk)
+                              e3t_a(ji,jj,jk) = e3t_n(ji,jj,jk)
+                           ENDIF
+                        END DO
+                     END DO
+                  END DO
+                  CALL dom_vvl_zgr
+               ENDIF
+               !
             ENDIF 
             ub  (:,:,:) = 0._wp
-            vb  (:,:,:) = 0._wp  
+            vb  (:,:,:) = 0._wp
             !
          ELSE                                 ! user defined initial T and S
             CALL usr_def_istate( gdept_b, tmask, tsb, ub, vb, sshb  )         
+            !
+            IF( .NOT.ln_linssh ) THEN         ! adjust initial vertical scale factors
+               sshn(:,:) = sshb(:,:)
+               z2d (:,:) = 1._wp + sshn(:,:) * ssmask(:,:) / ( ht_0(:,:) + 1._wp - ssmask(:,:) )
+               DO jk = 1, jpkm1                
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
+                        e3t_n(ji,jj,jk) = e3t_0(ji,jj,jk) * ( z2d(ji,jj) * tmask(ji,jj,jk) - ( tmask(ji,jj,jk) - 1._wp ) )
+                        e3t_b(ji,jj,jk) = e3t_n(ji,jj,jk)
+                        e3t_a(ji,jj,jk) = e3t_n(ji,jj,jk)
+                     END DO
+                  END DO
+               END DO
+               CALL dom_vvl_zgr
+            ENDIF
+            !
          ENDIF
          tsn  (:,:,:,:) = tsb (:,:,:,:)       ! set now values from to before ones