Changeset 111

Timestamp:

06/09/17 10:26:41 (7 years ago)

Author:

dumas

Message:

Update water cycle : iceberg found in determin_tache are removed in calving

Location:

trunk/SOURCES

Files:

• 3D-physique-gen_mod.f90 (modified) (1 diff)
• bilan_eau.f90 (modified) (1 diff)
• calving_frange.f90 (modified) (2 diffs)
• flottab2-0.7.f90 (modified) (9 diffs)
• steps_time_loop.f90 (modified) (1 diff)

trunk/SOURCES/3D-physique-gen_mod.f90

@@ -490 +490 @@
   logical,dimension(nx,ny) :: new_flotmy !< pour signaler les points qui deviennent flottantmy entre 2 dtt 
   logical,dimension(nx,ny) :: flot_marais  !< afq -- vrai si flottant et coince entre points poses 'o'
+  logical,dimension(nx,ny) :: iceberg   !< point iceberg
 
   ! ===================== File id =========================================

trunk/SOURCES/bilan_eau.f90

@@ -50 +50 @@
 
 sum_H = sum(H(2:nx-1,2:ny-1),mask=ice(2:nx-1,2:ny-1)==1)
-diff_H = diff_H + (sum_H - sum_H_old) ! on calcul la variation de volume à chaque dt
+
+if (nt.eq.1) then
+  diff_H=0.
+else
+  diff_H = diff_H + (sum_H - sum_H_old) ! on calcul la variation de volume a chaque dt
+endif
 
 diff_H_2D(2:nx-1,2:ny-1)=H(2:nx-1,2:ny-1)-H_beau_old(2:nx-1,2:ny-1)

trunk/SOURCES/calving_frange.f90

@@ -399 +399 @@
 !cdc 1m                     H(i,j)=min(1.,max(0.,(sealevel - Bsoc(i,j))*row/ro-0.01))
                      H(i,j)=0.
+                     S(i,j)=H(i,j)*(1.-ro/row) + sealevel
+                     B(i,j)=S(i,j) - H(i,j)
                    endif  
 
@@ -405 +407 @@
          end do
       end do
+      
+! on met en calving les points detectes iceberg :
+       where (iceberg(:,:))   
+             ice(:,:)=0
+             H(:,:)=0.
+             S(:,:)=H(:,:)*(1.-ro/row) + sealevel
+             B(:,:)=S(:,:) - H(:,:)
+       endwhere   
       
        where (front.le.0)

trunk/SOURCES/flottab2-0.7.f90

@@ -49 +49 @@
  integer,dimension(0:n_ta_max)     :: compt        !< contient les equivalence entre les taches
  integer,dimension(0:n_ta_max)     :: nb_pts_tache !< indique le nombre de points par tache
- logical,dimension(0:n_ta_max)     :: iceberg      !< T si iceberg, F si calotte posee
+ logical,dimension(0:n_ta_max)     :: iceberg1D      !< T si iceberg, F si calotte posee
  
  logical,dimension(nx,ny)        :: mask_tache_ij !< masque de travail 
@@ -153 +153 @@
     frontfacex(:,:)=0
     frontfacey(:,:)=0
-    isolx(:,:)=.FALSE.
-    isoly(:,:)=.FALSE.
+    isolx(:,:)=.false.
+    isoly(:,:)=.false.
     cotemx(:,:)=.false.
     cotemy(:,:)=.false.
     boost=.false.
+    iceberg(:,:)=.false.
     !$OMP END WORKSHARE
 
@@ -643 +644 @@
     do j=3,ny-2
        do i=3,nx-2
-    test1:  if (.not.iceberg(table_out(i,j))) then ! on est pas sur un iceberg 
+    test1:  if (.not.iceberg1D(table_out(i,j))) then ! on est pas sur un iceberg 
              if (nb_pts_tache(table_out(i,j)).ge.1) then
                  ice(i,j)=1
@@ -696 +697 @@
                 endif test2 
              end if                                             ! endif deplace
-             
-          else ! on est sur un iceberg                          !   test1
-             ice(i,j)=0
-             h(i,j)=0. !1. afq, we should put everything in calving!
-             surnet=H(i,j)*(1.-ro/row)
-             S(i,j)=surnet+sealevel
-             B(i,j)=S(i,j)-H(i,j)
+!cdc transfere dans calving :             
+           else ! on est sur un iceberg                          !   test1
+                iceberg(i,j)=iceberg1D(table_out(i,j))
+!~              ice(i,j)=0
+!~              h(i,j)=0. !1. afq, we should put everything in calving!
+!~              surnet=H(i,j)*(1.-ro/row)
+!~              S(i,j)=surnet+sealevel
+!~              B(i,j)=S(i,j)-H(i,j)
              
           endif test1
@@ -740 +742 @@
     !read(5,*)
 
-    call determin_front
-    !call determin_front_tof ! version simplifiee
+    !call determin_front ! cette version ne conserve pas la masse !!!
+    call determin_front_tof ! version simplifiee
 
     call determin_marais
@@ -777 +779 @@
 !$OMP WORKSHARE
 table_out(:,:) = 0
-iceberg(:)  = .true.
+iceberg1D(:)  = .true.
 icetrim (:) = .true.
 nb_pts_tache(:) = 0
@@ -810 +812 @@
            !si ce noeud est posé, alors la tache n'est pas un iceberg et iceberg=.F.
            if (.not.FLOT(I,J)) then
-              iceberg(label)=.false.
+              iceberg1D(label)=.false.
            endif
 
@@ -835 +837 @@
            !si ce noeud est posé, alors la ache n'est pas un iceberg et iceberg=.F.
            if (.not.FLOT(I,J)) then
-              iceberg(label_max)=.false.
+              iceberg1D(label_max)=.false.
            endif
 
@@ -867 +869 @@
    if (compt(indice).lt.0) then 
       compt(indice)= compt(-vartemp)
-      if (.not.iceberg(indice)) iceberg(-vartemp)=.false.
+      if (.not.iceberg1D(indice)) iceberg1D(-vartemp)=.false.
       if (.not.icetrim(indice)) icetrim(-vartemp)=.false.
    endif    

trunk/SOURCES/steps_time_loop.f90

@@ -110 +110 @@
   !------------------------------------------------------------------
   if ((mod(abs(TIME),NDISP*1.).lt.dtmin).or.(isynchro.eq.1).or.(nt.eq.1)) then
-
-     call shortoutput()
-
+     call bilan_eau
+     call shortoutput
   endif