Changeset 97 for trunk/SOURCES

Timestamp:

01/03/17 15:54:13 (8 years ago)

Author:

aquiquet

Message:

Small bug correction in Schoof grounding line flux

File:

• trunk/SOURCES/furst_schoof_mod.f90 (modified) (4 diffs)

trunk/SOURCES/furst_schoof_mod.f90

@@ -80 +80 @@
   county(:,:)=0.
 
-        archimtab(:,:) = Bsoc(:,:)+H(:,:)*ro/row -sealevel
+  archimtab(:,:) = Bsoc(:,:)+H(:,:)*alpha_flot -sealevel
 
   ! detection des noeuds grounding line
   do j= 3,ny-3
      do i=3,nx-3
-        archim = Bsoc(i,j)+H(i,j)*ro/row -sealevel
-        if ((H(i,j).gt.0.).and.(archim.GE.0.).and.(Bsoc(i,j).LE.sealevel)) then    ! grounded and with ice
+        !archim = Bsoc(i,j)+H(i,j)*ro/row -sealevel
+        if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel)) then    ! grounded and with ice
            !           print*,'schoof gr line ij',i,j
            ! selon x (indice i)
@@ -160 +160 @@
               end if
                                          
-                                         else if (archimtab(i+1,j).LT.0..and.Uxbar(i+1,j).GT.0.) then
+           else if (archimtab(i+1,j).LT.0..and.Uxbar(i+1,j).GT.0.) then
            !else if (flot(i+1,j).and.Uxbar(i+1,j).GT.0.) then    ! grounding line between i,i+1    CAS EST (ecoulement vers grille Est)
 
@@ -252 +252 @@
                  uybartemp(i,j-1)   = uybartemp(i,j-1) + phi_ygl(i,j-1) / Hmyloc(i,j-1) ! attention division par 0 possible ?
                  county   (i,j-1)   = county(i,j-1)+1
-                 imy_diag (i-1,j) = 1
+                 imy_diag (i,j-1) = 1
 
                  ! extrapolation pour avoir uybar(i,j)
@@ -437 +437 @@
                 print*,'B_0, alpha, H_0, SL', B_0, alpha, H_0, SL
                 print*,'archim=',B_1+H_1*alpha - SL
-                stop
-        endif
+                !stop
+                xpos = min(max(0.,xpos),1.)
+  endif
         
   xpos = xpos * dy