Changeset 5836 for trunk/NEMOGCM/NEMO/LIM_SRC_3/limadv.F90

Timestamp:

2015-10-26T15:49:40+01:00 (8 years ago)

Author:

cetlod

Message:

merge the simplification branch onto the trunk, see ticket #1612

File:

• trunk/NEMOGCM/NEMO/LIM_SRC_3/limadv.F90 (modified) (2 diffs)

trunk/NEMOGCM/NEMO/LIM_SRC_3/limadv.F90

@@ -97 +97 @@
 
       !  Initialize volumes of boxes  (=area if adv_x first called, =psm otherwise)                                     
-      psm (:,:)  = MAX( pcrh * e12t(:,:) + ( 1.0 - pcrh ) * psm(:,:) , epsi20 )
+      psm (:,:)  = MAX( pcrh * e1e2t(:,:) + ( 1.0 - pcrh ) * psm(:,:) , epsi20 )
 
       !  Calculate fluxes and moments between boxes i<-->i+1              
@@ -282 +282 @@
 
       !  Initialize volumes of boxes (=area if adv_x first called, =psm otherwise)
-      psm(:,:)  = MAX(  pcrh * e12t(:,:) + ( 1.0 - pcrh ) * psm(:,:) , epsi20  )
+      psm(:,:)  = MAX(  pcrh * e1e2t(:,:) + ( 1.0 - pcrh ) * psm(:,:) , epsi20  )
 
       !  Calculate fluxes and moments between boxes j<-->j+1