Changeset 237 for trunk/SOURCES/bilan_eau_mod.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/bilan_eau_mod.f90 (modified) (4 diffs)

trunk/SOURCES/bilan_eau_mod.f90

@@ -45 +45 @@
 subroutine init_bilan_eau
  ! initialisation des variables
-        diff_H=0.
-        sum_H_old = sum(H(2:nx-1,2:ny-1),mask=ice(2:nx-1,2:ny-1)==1)
-        tot_water(:,:)=0.
-        bm_dt(:,:)=0.
-        bmelt_dt(:,:)=0.
+        diff_H=0.
+        sum_H_old = sum(H(2:nx-1,2:ny-1),mask=ice(2:nx-1,2:ny-1)==1)
+        tot_water(:,:)=0.
+        bm_dt(:,:)=0.
+        bmelt_dt(:,:)=0.
         alpha_flot=ro/row
-        archimtab(:,:) = Bsoc(:,:)+H(:,:)*alpha_flot - sealevel
+        archimtab(:,:) = Bsoc(:,:)+H(:,:)*alpha_flot - sealevel_2d(:,:)
         gr_line(:,:)=0
         do j=1,ny
            do i=1,nx
-              !afq    if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel)) then ! grounded with ice
+              !afq    if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel_2d(i,j))) then ! grounded with ice
               if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.)) then ! grounded with ice
                  if (archimtab(i-1,j).LT.0..and.Uxbar(i,j).LT.0..and..not.flot_marais(i-1,j)) gr_line(i,j)=1
@@ -67 +67 @@
 end subroutine init_bilan_eau
 
-        
+
 
 
@@ -101 +101 @@
 
 where (ice(2:nx-1,2:ny-1).eq.1)
-        Bm_dtt(2:nx-1,2:ny-1) = Bm_dtt(2:nx-1,2:ny-1) + Bm_dt(2:nx-1,2:ny-1) !* dt ! somme Bm sur dt
-        bmelt_dtt(2:nx-1,2:ny-1) = bmelt_dtt(2:nx-1,2:ny-1) + bmelt_dt(2:nx-1,2:ny-1) ! * dt ! somme bmelt sur dt
+        Bm_dtt(2:nx-1,2:ny-1) = Bm_dtt(2:nx-1,2:ny-1) + Bm_dt(2:nx-1,2:ny-1) !* dt ! somme Bm sur dt
+        bmelt_dtt(2:nx-1,2:ny-1) = bmelt_dtt(2:nx-1,2:ny-1) + bmelt_dt(2:nx-1,2:ny-1) ! * dt ! somme bmelt sur dt
 endwhere
 
-archimtab(:,:) = Bsoc(:,:)+H(:,:)*alpha_flot - sealevel
+archimtab(:,:) = Bsoc(:,:)+H(:,:)*alpha_flot - sealevel_2d(:,:)
 gr_line(:,:)=0
 do j=1,ny
   do i=1,nx
-     !afq    if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel)) then ! grounded with ice
+     !afq    if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.).and.(Bsoc(i,j).LE.sealevel_2d(i,j))) then ! grounded with ice
      if ((H(i,j).gt.0.).and.(archimtab(i,j).GE.0.)) then ! grounded with ice
       if (archimtab(i-1,j).LT.0..and.Uxbar(i,j).LT.0..and..not.flot_marais(i-1,j)) gr_line(i,j)=1
@@ -141 +141 @@
    
 ! bilan d'eau sur la grille :
-        water_bilan=sum(tot_water(:,:))
-        diff_H = diff_H/dtt
+        water_bilan=sum(tot_water(:,:))
+        diff_H = diff_H/dtt
 
 !999 format(f0.2,1x,e15.8,1x,i10,8(1x,e15.8))
 !       write(6,999),time,sum_H,count(ice(:,:)==1),diff_H,water_bilan,sum(calv_dtt(:,:))/dtt,sum(ablbord_dtt(:,:))/dtt,sum(bmelt_dtt(:,:),mask=ice(:,:)==1)/dtt,sum(bm(:,:),mask=ice(:,:)==1),sum(Bm_dtt(:,:))/dtt,sum(bmelt_dtt(:,:))/dtt
-        diff_H_water_bilan(2:nx-1,2:ny-1)=tot_water(2:nx-1,2:ny-1)-diff_H_2D(2:nx-1,2:ny-1)
+        diff_H_water_bilan(2:nx-1,2:ny-1)=tot_water(2:nx-1,2:ny-1)-diff_H_2D(2:nx-1,2:ny-1)
 
 endif