Changeset 287 for branches/iLoveclim/SOURCES/bilan_eau_mod.f90

Timestamp:

10/17/19 09:42:41 (5 years ago)

Author:

aquiquet

Message:

Trunk merged to iLoveclim branch at revision 286

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/bilan_eau_mod.f90 (modified) (4 diffs)

branches/iLoveclim/SOURCES/bilan_eau_mod.f90

@@ -36 +36 @@
 real :: sum_H_old
 real :: diff_H
-real :: alpha_flot                      ! ro/row 
+real :: alpha_flot                      ! ro/row
+real :: dtt_flux   ! 1 an si dtt<1an sinon dtt_loc=dtt 
 
 real,dimension(nx,ny) :: bm_dt,bmelt_dt
@@ -45 +46 @@
 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)
-        H_beau_old(:,:)=H(:,:)
-        tot_water(:,:)=0.
-        bm_dt(:,:)=0.
-        bmelt_dt(:,:)=0.
-        alpha_flot=ro/row
-        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_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
-                 if (archimtab(i+1,j).LT.0..and.Uxbar(i+1,j).GT.0..and..not.flot_marais(i+1,j)) gr_line(i,j)=1
-                 if (archimtab(i,j-1).LT.0..and.Uybar(i,j).LT.0..and..not.flot_marais(i,j-1)) gr_line(i,j)=1
-                 if (archimtab(i,j+1).LT.0..and.Uybar(i,j+1).GT.0..and..not.flot_marais(i,j+1)) gr_line(i,j)=1
-              endif
-           enddo
-        enddo
+  diff_H=0.
+  sum_H_old = sum(H(2:nx-1,2:ny-1),mask=ice(2:nx-1,2:ny-1)==1)
+  H_beau_old(:,:)=H(:,:)
+  tot_water(:,:)=0.
+  bm_dt(:,:)=0.
+  bmelt_dt(:,:)=0.
+  alpha_flot=ro/row
+  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_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
+        if (archimtab(i+1,j).LT.0..and.Uxbar(i+1,j).GT.0..and..not.flot_marais(i+1,j)) gr_line(i,j)=1
+        if (archimtab(i,j-1).LT.0..and.Uybar(i,j).LT.0..and..not.flot_marais(i,j-1)) gr_line(i,j)=1
+        if (archimtab(i,j+1).LT.0..and.Uybar(i,j+1).GT.0..and..not.flot_marais(i,j+1)) gr_line(i,j)=1
+      endif
+    enddo
+  enddo
+  if (dtt.ge.1.) then
+    dtt_flux=dtt
+  else
+    dtt_flux=1.
+  endif
 
 ! iLOVECLIM initialisation of water conservation related variables
@@ -135 +141 @@
 endwhere
 
-
-!afq -- if (isynchro.eq.1) then
-if ((isynchro.eq.1).or.(nt.eq.1)) then
-
+if ((isynchro.eq.1.and.(mod(abs(TIME),1.).lt.dtmin)).or.(nt.eq.1)) then
 ! on raisonne en bilan annuel pour simplifier :
 !~      where (ice(2:nx-1,2:ny-1).eq.1)
@@ -146 +149 @@
 !~      endwhere
 !cdc pas besoin du test sur ice ici, il a ete fait avant (et le masque ice varie a chaque dt)   
-  tot_water(2:nx-1,2:ny-1) = (Bm_dtt(2:nx-1,2:ny-1) - Bmelt_dtt(2:nx-1,2:ny-1) + calv_dtt(2:nx-1,2:ny-1) - ablbord_dtt(2:nx-1,2:ny-1)) / dtt
+  tot_water(2:nx-1,2:ny-1) = (Bm_dtt(2:nx-1,2:ny-1) - Bmelt_dtt(2:nx-1,2:ny-1) + calv_dtt(2:nx-1,2:ny-1) - ablbord_dtt(2:nx-1,2:ny-1)) / dtt_flux
    
 ! 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_flux
 
 !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