Changeset 237 for trunk/SOURCES/Eurasie40_files

Timestamp:

01/09/19 17:09:26 (5 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.

Location:

trunk/SOURCES/Eurasie40_files

Files:

• bmelt-eurasie-depth-lake_mod.f90 (modified) (4 diffs)
• climat-forcage-eurasie_mod-0.4.f90 (modified) (1 diff)
• lakes-prescribed_mod-0.1.f90 (modified) (2 diffs)
• output_eurasie40_mod-0.1.f90 (modified) (1 diff)

trunk/SOURCES/Eurasie40_files/bmelt-eurasie-depth-lake_mod.f90

@@ -85 +85 @@
          do i=1,nx
 
-            if ((sealevel-BSOC(i,j)).lt.450) then
+            if ((sealevel_2d(i,j)-BSOC(i,j)).lt.450) then
                     bmshelf(i,j)=2.00 !3.00! 2.55! 0.45!   0.65  
                     bmgrz(i,j)=2.00 !3.00! 2.55! 0.45 !  0.65
@@ -127 +127 @@
  
 
-                   if (slv(i,j).gt.0) then
+                   if (sealevel_2d(i,j).gt.0) then
                          bmshelf(i,j)=0.05!5.0    
                          bmgrz(i,j)=0.05!5.0
@@ -135 +135 @@
         
                      
-             if (slv(i,j).gt.sealevel) then
+             if (sealevel_2d(i,j).gt.sealevel) then
                      bmelt(i,j)=bmshelf(i,j)
                      if (fbm(i,j))  bmelt(i,j)=bmgrz(i,j)
@@ -166 +166 @@
 !   en fonction du nombre de points flottants
 
-           if (slv(i,j).gt.sealevel) then
+           if (sealevel_2d(i,j).gt.sealevel) then
                  bmelt(i,j)= ngr/4.*bmgrz(i,j)+(1.-ngr/4.)*bmelt(i,j)         
            else

trunk/SOURCES/Eurasie40_files/climat-forcage-eurasie_mod-0.4.f90

@@ -493 +493 @@
    nom_table='lvflo'
    call printtable_r(levelflot,nom_table)
-    
+   
+   sealevel_2d(:,:) = sealevel
+
 !   coefbmshelf(:,:)=(1.+delTatime(:,:)/7.)  
 !coefbmshelf=1. ! modif pour test de sensibilite (tof 20 avril 01)

trunk/SOURCES/Eurasie40_files/lakes-prescribed_mod-0.1.f90

@@ -54 +54 @@
 subroutine lake_to_slv
 
-! inclut les lacs dans le tableau slv des niveaux de flottaison
+! inclut les lacs dans le tableau sealevel_2d des niveaux de flottaison
 
-slv(:,:)=sealevel
+sealevel_2d(:,:)=sealevel
 
 ! VOIR COMMENT ACTIVER-DESACTIVER LES LACS EN FONCTION DU TEMPS
@@ -64 +64 @@
       do i_lake=1,nb_lakes
          if (lake(i,j).eq.i_lake) then 
-            slv(i,j)=max(level_lakes(i_lake),Bsoc(i,j))
+            sealevel_2d(i,j)=max(level_lakes(i_lake),Bsoc(i,j))
          end if
       end do

trunk/SOURCES/Eurasie40_files/output_eurasie40_mod-0.1.f90

@@ -85 +85 @@
 
 !        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