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

trunk/SOURCES/calving_frange.f90

@@ -89 +89 @@
 
     Hcoup(:,:) = min ( max(                                         &
-       (-(Bsoc0(:,:)-sealevel) - prof_plateau)/(prof_abysses-prof_plateau)    &
+       (-(Bsoc0(:,:)-sealevel_2d(:,:)) - prof_plateau)/(prof_abysses-prof_plateau)    &
        *(hcoup_abysses-hcoup_plateau)+hcoup_plateau               &
        , hcoup_plateau), hcoup_abysses )
@@ -121 +121 @@
 
     Hcoup(:,:) = min ( max(                                         &
-       (-(Bsoc(:,:)-sealevel) - prof_plateau)/(prof_abysses-prof_plateau)    &
+       (-(Bsoc(:,:)-sealevel_2d(:,:)) - prof_plateau)/(prof_abysses-prof_plateau)    &
        *(hcoup_abysses-hcoup_plateau)+hcoup_plateau               &
        , hcoup_plateau), hcoup_abysses )
@@ -409 +409 @@
                       calv(i,j)=-h(i,j) 
                       !cdc                     H(i,j)=1. 
-                      !cdc 1m                     H(i,j)=min(1.,max(0.,(sealevel - Bsoc(i,j))*row/ro-0.01))
+                      !cdc 1m                     H(i,j)=min(1.,max(0.,(sealevel_2d(i,j) - Bsoc(i,j))*row/ro-0.01))
                       H(i,j)=0.
-                      S(i,j)=H(i,j)*(1.-ro/row) + sealevel
+                      S(i,j)=H(i,j)*(1.-ro/row) + sealevel_2d(i,j) !afq -- WARNING: est-ce qu'on veut vraiment mettre S a la valeur locale du niveau marin?
                       B(i,j)=S(i,j) - H(i,j)
                       ! ATTENTION ne pas mettre ice=0 sinon degradation bilan d'eau (bm et bmelt non comptabilises dans ce cas)
@@ -439 +439 @@
         ice(:,:)=0
         H(:,:)=0.
-        S(:,:)=H(:,:)*(1.-ro/row) + sealevel
+        S(:,:)=H(:,:)*(1.-ro/row) + sealevel_2d(:,:) !afq -- WARNING: est-ce qu'on veut vraiment mettre S a la valeur locale du niveau marin?
         B(:,:)=S(:,:) - H(:,:)
     endwhere