Changeset 121

Timestamp:

06/27/17 14:31:50 (7 years ago)

Author:

dumas

Message:

Update steps_time_loop_avec_iterbeta | flottab : points without ice in ocean are flot=true

Location:

trunk/SOURCES

Files:

• flottab2-0.7.f90 (modified) (1 diff)
• steps_time_loop_avec_iterbeta.f90 (modified) (6 diffs)

trunk/SOURCES/flottab2-0.7.f90

@@ -225 +225 @@
 !cdc         H(i,j)=1.
 !cdc  1m           H(i,j)=min(1.,max(0.,(sealevel - Bsoc(i,j))*row/ro-0.01))
+             flot(i,j)=.true.  !cdc points ocean sont flot meme sans glace
              H(i,j)=0.
              S(i,j)=sealevel

trunk/SOURCES/steps_time_loop_avec_iterbeta.f90

@@ -21 +21 @@
   use sorties_ncdf_grisli
   use flottab_mod
-  use diagno_mod 
+  use diagno_mod
+  use bilan_eau_mod
 
 
@@ -58 +59 @@
      call icethick3
 
+     call flottab
+
      call calving
-
+     
+     call ablation_bord
+     
+     call bilan_eau
+     if (isynchro.eq.1) then
+         call shortoutput
+         diff_H = 0.
+         Bm_dtt(:,:) = 0.
+         bmelt_dtt(:,:) = 0.
+         calv_dtt(:,:)=0.
+         ablbord_dtt(:,:)=0.
+         diff_H_2D(:,:)=0.
+     endif
+        
+     call flottab
+     
      if (itracebug.eq.1)  call tracebug('apres calving')
 
@@ -65 +83 @@
      where(.not.flot(:,:))
         S(:,:)=Bsoc(:,:)+H(:,:)
+        S(:,:)=max(S(:,:),sealevel)
         B(:,:)=Bsoc(:,:)
      end where
-
+     
      ! calcul de Hmx et Hmy -> shift=-1, dim=1 -> H(i-1,j)
 
@@ -74 +93 @@
      hmx(1,:)=0.
      hmy(:,1)=0.
-     hmx(:,:) = max(hmx(:,:),0.)
-     hmy(:,:) = max(hmy(:,:),0.)
-
 
      ! mise a 0 des vitesses quand epaisseur nulle
@@ -104 +120 @@
   !====================================================================
 
-  ! time outputs  (volume, extent, ...) 
-  !------------------------------------------------------------------
-  if ((mod(abs(TIME),NDISP*1.).lt.dtmin).or.(isynchro.eq.1).or.(nt.eq.1)) then
-
-     call shortoutput()
-
-  endif
-
-
   ! horizontal plan snapshots
   !------------------------------------------------------------------
@@ -164 +171 @@
 
   ! end of outputs
-  if (isynchro.eq.1) then
-                 diff_H = 0.
-                 Bm_dtt(:,:) = 0.
-                 bmelt_dtt(:,:) = 0.
-           calv_dtt(:,:)=0.
-                 ablbord_dtt(:,:)=0.
-                 diff_H_2D(:,:)=0.
-        endif   
-  !===================================================================
-
 
   !====================================================================