Changeset 638

Timestamp:

05/28/09 17:01:13 (16 years ago)

Author:

seroussi

Message:

fixed problem with diagnostic mixed hutter/macayeal in 2d

File:

• issm/trunk/src/m/solutions/ice/diagnostic2d.m (modified) (2 diffs)

issm/trunk/src/m/solutions/ice/diagnostic2d.m

@@ -8 +8 @@
 %
 %   See also: ICEDIAGNOSTIC, ICEDIAGNOSTIC3D, ICEDIAGNOSTIC_CORE_NONLINEAR
+
+%global variables
+iceglobal
 
 %recover inputs
@@ -36 +39 @@
         u_g=diagnostic_core_linear(m_dhu,'diagnostic_hutter',inputs);
 
+        if fem.ismacayealpattyn,
+                gridset=fem.m_dh.gridset;
+                fem.m_dh.ys=Reducevector_g(u_g);
+        end
+
         %Computation of depth averaged pressure with MacAyeal's assumptions (P_bar=1/2*rho_ice*g*H in Pa)
         u_g(4:6:m_dhu.gridset.gsize)=1/2*md.rho_ice*md.g*md.thickness;