Changeset 4366 for branches/2013

Timestamp:

2014-01-22T15:57:03+01:00 (10 years ago)

Author:

jchanut

Message:

correct vvl initialization, ticket #1227

Location:

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

Files:

• domain.F90 (modified) (2 diffs)
• domhgr.F90 (modified) (1 diff)
• domvvl.F90 (modified) (2 diffs)

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

@@ -90 +90 @@
       !
       IF( lk_c1d         )   CALL cor_c1d      ! 1D configuration: Coriolis set at T-point
-      !
-      ! - ML - Used in dom_vvl_sf_nxt and lateral diffusion routines
-      !        but could be usefull in many other routines
-      e12t    (:,:) = e1t(:,:) * e2t(:,:)
-      e12u    (:,:) = e1u(:,:) * e2u(:,:)
-      e12v    (:,:) = e1v(:,:) * e2v(:,:)
-      e12f    (:,:) = e1f(:,:) * e2f(:,:)
-      r1_e12t (:,:) = 1._wp    / e12t(:,:)
-      r1_e12u (:,:) = 1._wp    / e12u(:,:)
-      r1_e12v (:,:) = 1._wp    / e12v(:,:)
-      r1_e12f (:,:) = 1._wp    / e12f(:,:)
-      re2u_e1u(:,:) = e2u(:,:) / e1u(:,:)
-      re1v_e2v(:,:) = e1v(:,:) / e2v(:,:)
       !
       hu(:,:) = 0._wp                          ! Ocean depth at U- and V-points
@@ -460 +447 @@
    !!======================================================================
 END MODULE domain
+

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

@@ -458 +458 @@
       ! --------------
       e1e2t(:,:) = e1t(:,:) * e2t(:,:)
-
+    
+      ! Useful shortcuts (JC: note the duplicated e2e2t array ! Need some cleaning)
+      ! ---------------------------------------------------------------------------
+      e12t    (:,:) = e1t(:,:) * e2t(:,:)
+      e12u    (:,:) = e1u(:,:) * e2u(:,:)
+      e12v    (:,:) = e1v(:,:) * e2v(:,:)
+      e12f    (:,:) = e1f(:,:) * e2f(:,:)
+      r1_e12t (:,:) = 1._wp    / e12t(:,:)
+      r1_e12u (:,:) = 1._wp    / e12u(:,:)
+      r1_e12v (:,:) = 1._wp    / e12v(:,:)
+      r1_e12f (:,:) = 1._wp    / e12f(:,:)
+      re2u_e1u(:,:) = e2u(:,:) / e1u(:,:)
+      re1v_e2v(:,:) = e1v(:,:) / e2v(:,:)
 
       ! Control printing : Grid informations (if not restart)

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

@@ -772 +772 @@
          IF( ln_rstart ) THEN                   !* Read the restart file
             CALL rst_read_open                  !  open the restart file if necessary
+            CALL iom_get( numror, jpdom_autoglo, 'sshn'   , sshn    )
+            !
             id1 = iom_varid( numror, 'fse3t_b', ldstop = .FALSE. )
             id2 = iom_varid( numror, 'fse3t_n', ldstop = .FALSE. )
@@ -823 +825 @@
             fse3t_b(:,:,:) = e3t_0(:,:,:)
             fse3t_n(:,:,:) = e3t_0(:,:,:)
+            sshn(:,:) = 0.0_wp
             IF( ln_vvl_ztilde .OR. ln_vvl_layer) THEN
                tilde_e3t_b(:,:,:) = 0.0_wp