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

trunk/SOURCES/GrIce2sea_files/output_Grice2sea_mod.f90

@@ -196 +196 @@
              
              !        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
              
@@ -298 +298 @@
                 scal_np         =  scal_np + 1
                 scal_vol        =  scal_vol + H(i,j)
-                scal_volbuoy    =  scal_volbuoy + H(i,j) - row/ro * max(0.,sealevel-b(i,j))
+                scal_volbuoy    =  scal_volbuoy + H(i,j) - row/ro * max(0.,sealevel_2d(i,j)-b(i,j))
                 scal_meanhdot   =  scal_meanhdot + Hdot(i,j)
                 scal_sigma_hdot =  scal_sigma_hdot + Hdot(i,j)**2