Changeset 244 for branches/iLoveclim/SOURCES/Snowball_files/output_snowball_mod-0.4.f90

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/output_snowball_mod-0.4.f90 (modified) (1 diff)

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