Changeset 244 for branches/iLoveclim/SOURCES/Snowball_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/Snowball_files/bmelt-snowball-depth_mod.f90 (modified) (2 diffs)
• SOURCES/Snowball_files/module_choix-snowball.f90 (modified) (2 diffs)
• SOURCES/Snowball_files/output_snowball_mod-0.4.f90 (modified) (1 diff)

branches/iLoveclim/SOURCES/Snowball_files/bmelt-snowball-depth_mod.f90

@@ -66 +66 @@
          do i=1,nx
 
-            if ((sealevel-bsoc(i,j)).lt.600) then
+            if ((sealevel_2d(i,j)-bsoc(i,j)).lt.600) then
                     bmshelf(i,j)=0.2 ! 0.45!   0.65  
                     bmgrz(i,j)=0.2 ! 0.45 !  0.65
@@ -106 +106 @@
 shelf:    if (flot(i,j)) then    ! partie flottante
 
-            if ((sealevel-bsoc(i,j)).lt.600) then
+            if ((sealevel_2d(i,j)-bsoc(i,j)).lt.600) then
                     if ((j.lt.75).and.(i.lt.145) ) then  !Atlantique 
                     bmelt(i,j)=(.6+.4*coefbmshelf)*bmshelf(i,j)

branches/iLoveclim/SOURCES/Snowball_files/module_choix-snowball.f90

@@ -12 +12 @@
 !! @note   - use lect_clim_act_hemin40
 !! @note   - use climat_forcage_mod
-!! @note   - use no_lakes
+!! @note   - use no_rsl
 !! @note   - use isostasie_mod  
 !! @note   - use deformation_mod
@@ -64 +64 @@
 !use no_ablation  ! pas de calcul de l'ablation => lecture fichier SMB (necessaire avec climat_Grice2sea_years_mod)
 
-! pas de lacs proglaciaires
-use no_lakes
+! pas de differences locales de niveau marin
+use no_rsl
 
 ! suivi des traceurs ou pas ?

branches/iLoveclim/SOURCES/Snowball_files/output_snowball_mod-0.4.f90

@@ -83 +83 @@
                   vol=vol+h(i,j) 
 !        calcul de la hauteur au dessus de la flottaison
-                  if (sealevel-B(i,j).le.0.) then    ! socle au dessus du niveau des mers
+                  if (sealevel_2d(i,j)-B(i,j).le.0.) then    ! socle au dessus du niveau des mers
                      volf=volf+h(i,j)
                   else
-                     volf=volf+h(i,j)-row/ro*(sealevel-b(i,j))
+                     volf=volf+h(i,j)-row/ro*(sealevel_2d(i,j)-b(i,j))
                   endif