Changeset 4490

Timestamp:

2014-02-06T17:08:51+01:00 (10 years ago)

Author:

jchanut

Message:

Allow starting a vvl run without scale factors arrays

Location:

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• domain.F90 (modified) (1 diff)
• domvvl.F90 (modified) (3 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -87 +87 @@
                              CALL dom_msk      ! Masks
       IF( ln_sco )           CALL dom_stiff    ! Maximum stiffness ratio/hydrostatic consistency
+      !
+      ht_0(:,:) = 0.0_wp                       ! Reference ocean depth at T-points
+      hu_0(:,:) = 0.0_wp                       ! Reference ocean depth at U-points
+      hv_0(:,:) = 0.0_wp                       ! Reference ocean depth at V-points
+      DO jk = 1, jpk
+         ht_0(:,:) = ht_0(:,:) + e3t_0(:,:,jk) * tmask(:,:,jk)
+         hu_0(:,:) = hu_0(:,:) + e3u_0(:,:,jk) * umask(:,:,jk)
+         hv_0(:,:) = hv_0(:,:) + e3v_0(:,:,jk) * vmask(:,:,jk)
+      END DO
+      !
       IF( lk_vvl )           CALL dom_vvl_init ! Vertical variable mesh
       !

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -176 +176 @@
          fsdepw_b(:,:,jk) = fsdepw_b(:,:,jk-1) + fse3t_b(:,:,jk-1)
       END DO
-      ! Reference water column height at t-, u- and v- point
-      ! ----------------------------------------------------
-      ht_0(:,:) = 0.0_wp
-      hu_0(:,:) = 0.0_wp
-      hv_0(:,:) = 0.0_wp
-      DO jk = 1, jpk
-         ht_0(:,:) = ht_0(:,:) + e3t_0(:,:,jk) * tmask(:,:,jk)
-         hu_0(:,:) = hu_0(:,:) + e3u_0(:,:,jk) * umask(:,:,jk)
-         hv_0(:,:) = hv_0(:,:) + e3v_0(:,:,jk) * vmask(:,:,jk)
-      END DO
 
       ! Before depth and Inverse of the local depth of the water column at u- and v- points
@@ -803 +793 @@
       CHARACTER(len=*), INTENT(in) ::   cdrw   ! "READ"/"WRITE" flag
       !! * Local declarations
+      INTEGER ::   jk
       INTEGER ::   id1, id2, id3, id4, id5     ! local integers
       !!----------------------------------------------------------------------
@@ -828 +819 @@
                ENDIF
             ELSE IF( id1 > 0 ) THEN
-               IF(lwp) write(numout,*) 'dom_vvl_rst WARNING : fse3t_n not found in restart files'
-               IF(lwp) write(numout,*) 'fse3t_n set equal to fse3t_b.'
+               IF(lwp) write(numout,*) 'dom_vvl_rst WARNING : fse3t_b not found in restart files'
+               IF(lwp) write(numout,*) 'fse3t_b set equal to fse3t_n.'
+               IF(lwp) write(numout,*) 'neuler is forced to 0'
                fse3t_b(:,:,:) = fse3t_n(:,:,:)
-            ELSE                                 ! one at least array is missing
-               CALL ctl_stop( 'dom_vvl_rst: vvl cannot restart from a non vvl run' )
+               neuler = 0
+            ELSE
+               IF(lwp) write(numout,*) 'dom_vvl_rst WARNING : fse3t_n not found in restart file'
+               IF(lwp) write(numout,*) 'Compute scale factor from sshn'
+               IF(lwp) write(numout,*) 'neuler is forced to 0'
+               DO jk=1,jpk
+                  fse3t_n(:,:,jk) =  e3t_0(:,:,jk) * ( ht_0(:,:) + sshn(:,:) ) &
+                      &                            / ( ht_0(:,:) + 1._wp - tmask(:,:,1) ) * tmask(:,:,jk) &
+                      &            + e3t_0(:,:,jk) * (1._wp -tmask(:,:,jk))
+               END DO
+               fse3t_b(:,:,:) = fse3t_n(:,:,:)
+               neuler = 0
             ENDIF
             !                             ! ----------- !