Changeset 244 for branches/iLoveclim/SOURCES/Hudson_files

Timestamp:

01/16/19 16:08:14 (5 years ago)

Author:

aquiquet

Message:

Grisli-iloveclim branch merged to trunk at revision 243

Location:

branches/iLoveclim

Files:

• . (modified) (1 prop)
• SOURCES/Hudson_files/bmelt_hudson_mod.f90 (modified) (1 diff)
• SOURCES/Hudson_files/climat-hudson_mod.f90 (modified) (2 diffs)
• SOURCES/Hudson_files/eaubasale-0.5_hudson_mod.f90 (modified) (4 diffs)
• SOURCES/Hudson_files/module_choix-hudson-0.4.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/Hudson_files/bmelt_hudson_mod.f90

@@ -52 +52 @@
 !             bmgrz(i,j)= 10.
 
-          bmshelf(i,j)=(sealevel-BSOC(i,j))/200  ! jalv: eq lineaire en fonction de la profondeur de la mer
+          bmshelf(i,j)=(sealevel_2d(i,j)-BSOC(i,j))/200  ! jalv: eq lineaire en fonction de la profondeur de la mer
           bmgrz(i,j)=bmshelf(i,j)
 !          endif

branches/iLoveclim/SOURCES/Hudson_files/climat-hudson_mod.f90

@@ -102 +102 @@
 !jalv: test pour que le bilan de masse soit 0 sur l'ocean plus profond de 600 m:
 !      c'est le bon critere??:
-where (sealevel-BSOC(:,:).gt.600) acc(:,:)=0.
-where (sealevel-BSOC(:,:).gt.600) abl(:,:)=0.
+where (sealevel_2d(:,:)-BSOC(:,:).gt.600) acc(:,:)=0.
+where (sealevel_2d(:,:)-BSOC(:,:).gt.600) abl(:,:)=0.
 
-where ((sealevel-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2500.)) abl(:,:)=-1.
-where ((sealevel-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2600.)) abl(:,:)=-5.
-where ((sealevel-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2650.)) abl(:,:)=-10.
-where ((sealevel-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2700.)) abl(:,:)=-20.
+where ((sealevel_2d(:,:)-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2500.)) abl(:,:)=-1.
+where ((sealevel_2d(:,:)-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2600.)) abl(:,:)=-5.
+where ((sealevel_2d(:,:)-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2650.)) abl(:,:)=-10.
+where ((sealevel_2d(:,:)-BSOC(:,:).gt.100).and.(dist_heino(:,:).gt.2700.)) abl(:,:)=-20.
 
 bm(:,:)=acc(:,:)+abl(:,:)
@@ -135 +135 @@
 !      c'est le bon critere??:
 !where (BSOC(:,:).lt.B(:,:)) Tann(:,:)=0.
-where (sealevel-BSOC(:,:).gt.600) Tann(:,:)=0. 
+where (sealevel_2d(:,:)-BSOC(:,:).gt.600) Tann(:,:)=0. 
 
 

branches/iLoveclim/SOURCES/Hudson_files/eaubasale-0.5_hudson_mod.f90

@@ -139 +139 @@
         if (flot(i,j))then  ! points flottants
            klimit(i,j)=1
-           limit_hw(i,j)=(sealevel-Bsoc(i,j))*rowg/rofreshg
+           limit_hw(i,j)=(sealevel_2d(i,j)-Bsoc(i,j))*rowg/rofreshg
 
         else if (IBASE(I,J).eq.1) then ! base froide
@@ -182 +182 @@
            pot_w(I,J)=pot_w(I,J)+rog*H(I,J)
 
-           pot_f(I,J)=rowg*(sealevel-S(i,j)+H(I,J))  ! pression a la base de l'ice shelf
+           pot_f(I,J)=rowg*(sealevel_2d(i,j)-S(i,j)+H(I,J))  ! pression a la base de l'ice shelf
         enddo
      enddo
@@ -308 +308 @@
 
               if (flot(i,j)) then  ! if flot > hwater=hwater in ocean 
-                 hwater(i,j)= sealevel - bsoc(i,j)
+                 hwater(i,j)= sealevel_2d(i,j) - bsoc(i,j)
                  !             hwater(i,j)= max(0.,hwater(i,j))
                  if (hwater(i,j).lt.0.) hwater(i,j)=0.
@@ -320 +320 @@
 
               ! Attention le bloc suivant est pour le run 20 
-              !           Zflot=row/ro*(sealevel-Bsoc(i,j))-10.
+              !           Zflot=row/ro*(sealevel_2d(i,j)-Bsoc(i,j))-10.
               Zflot=H(i,j)*rog/rofreshg
 

branches/iLoveclim/SOURCES/Hudson_files/module_choix-hudson-0.4.f90

@@ -21 +21 @@
 use  climat_hudson
 
-! pas de lacs proglaciaires
-use no_lakes
+! pas de differences locales de niveau marin
+use no_rsl
 
 !--------------Lecture climat forcage---------------