Changeset 237 for trunk/SOURCES/Heino_files/flottab2-0.5-heino.f90

Timestamp:

01/09/19 17:09:26 (6 years ago)

Author:

aquiquet

Message:

Sealevel is now treated as a 2D variable (sealevel_2d while sealevel remains the eustatic sea level), results should remain identical as sealevel_2d is equal to sealevel in this revision.

File:

• trunk/SOURCES/Heino_files/flottab2-0.5-heino.f90 (modified) (7 diffs)

trunk/SOURCES/Heino_files/flottab2-0.5-heino.f90

@@ -135 +135 @@
       uys1(i,j)=uybar(i,j)
 
-      archim = Bsoc(i,j)+H(i,j)*ro/row -sealevel
+      archim = Bsoc(i,j)+H(i,j)*ro/row -sealevel_2d(i,j)
  
 arch: if ((ARCHIM.LT.0.).and.(H(I,J).gt.1.E-3)) then    ! le point flotte
@@ -146 +146 @@
              if (igrdline.eq.1) then   ! en cas de grounding line prescrite
                 flot(i,j)=.false.
-                H(i,j)=(10.+sealevel-Bsoc(i,j))*row/ro  ! pour avoir archim=10
+                H(i,j)=(10.+sealevel_2d(i,j)-Bsoc(i,j))*row/ro  ! pour avoir archim=10
                 new_flot_point(i,j)=.false.
              endif
@@ -162 +162 @@
                 if (igrdline.eq.1) then   ! en cas de grounding line prescrite
                     flot(i,j)=.false.
-                    H(i,j)=(10.+sealevel-Bsoc(i,j))*row/ro  ! pour avoir archim=10
+                    H(i,j)=(10.+sealevel_2d(i,j)-Bsoc(i,j))*row/ro  ! pour avoir archim=10
                    new_flot_point(i,j)=.false.
                endif
@@ -184 +184 @@
 
                 surnet=H(i,j)*(1.-ro/row)
-                S(i,j)=surnet+sealevel
+                S(i,j)=surnet+sealevel_2d(i,j)
                 B(i,j)=S(i,j)-H(i,j)
              end if
@@ -234 +234 @@
 !                 sur le demi noeud condition archim > 100 m
 
-             archim=(Bsoc(i,j)+Bsoc(i-1,j))*0.5-sealevel+ro/row*Hmx(i,j)
+             archim=(Bsoc(i,j)+Bsoc(i-1,j))*0.5-sealevel_2d(i,j)+ro/row*Hmx(i,j)
              gzmx(i,j)=gzmx(i,j).and.(archim.le.100.) 
 
@@ -301 +301 @@
 !                 sur le demi noeud condition archim > 100 m
 
-             archim=(Bsoc(i,j)+Bsoc(i,j-1))*0.5-sealevel+ro/row*Hmy(i,j)
+             archim=(Bsoc(i,j)+Bsoc(i,j-1))*0.5-sealevel_2d(i,j)+ro/row*Hmy(i,j)
              gzmy(i,j)=gzmy(i,j).and.(archim.le.100.) 
 
@@ -554 +554 @@
 !!!!!!!!!                      on teste si la tache n'est pas completement ice stream
       if (icetrim(table_out(i,j))) THEN ! on a une ile d'ice stream   !!!! TEST2
-              smax_i=0 ; smax_j=0 ; smax_=sealevel
+              smax_i=0 ; smax_j=0 ; smax_=sealevel !afq -- warning: what about local sealevel?
               DO II=3,NX-2
                 DO JJ=3,NY-2