Changeset 1040

Timestamp:

06/22/09 12:16:30 (15 years ago)

Author:

seroussi

Message:

pressure corrected for transient

Location:

issm/trunk/src/m/solutions/ice

Files:

• ModelProcessorDiagnosticVert.m (modified) (1 diff)
• ModelProcessorMelting.m (modified) (1 diff)
• ModelProcessorPrognostic.m (modified) (1 diff)
• ModelProcessorSlopeCompute.m (modified) (1 diff)
• ModelProcessorThermal.m (modified) (1 diff)
• UpdateGridPosition.m (modified) (1 diff)
• diagnostic3d.m (modified) (1 diff)

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

@@ -90 +90 @@
 grids(pos)=SetStructureField(grids(pos),'grid','z',md.z(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','s',(md.z(pos)-md.bed(pos))./md.thickness(pos));
+grids(pos)=SetStructureField(grids(pos),'grid','surface',md.surface(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','onbed',md.gridonbed(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','border',bordergrids(pos));

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

@@ -87 +87 @@
 grids(pos)=SetStructureField(grids(pos),'grid','z',md.z(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','s',(md.z(pos)-md.bed(pos))./md.thickness(pos));
+grids(pos)=SetStructureField(grids(pos),'grid','surface',md.surface(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','onbed',md.gridonbed(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','border',bordergrids(pos));

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

@@ -80 +80 @@
 grids(pos)=SetStructureField(grids(pos),'grid','z',md.z(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','s',(md.z(pos)-md.bed(pos))./md.thickness(pos));
+grids(pos)=SetStructureField(grids(pos),'grid','surface',md.surface(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','onbed',md.gridonbed(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','border',bordergrids(pos));

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

@@ -80 +80 @@
 grids(pos)=SetStructureField(grids(pos),'grid','z',md.z(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','s',(md.z(pos)-md.bed(pos))./md.thickness(pos));
+grids(pos)=SetStructureField(grids(pos),'grid','surface',md.surface(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','onbed',md.gridonbed(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','border',bordergrids(pos));

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

@@ -104 +104 @@
 grids(pos)=SetStructureField(grids(pos),'grid','z',md.z(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','s',(md.z(pos)-md.bed(pos))./md.thickness(pos));
+grids(pos)=SetStructureField(grids(pos),'grid','surface',md.surface(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','onbed',md.gridonbed(pos));
 grids(pos)=SetStructureField(grids(pos),'grid','border',bordergrids(pos));

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

@@ -14 +14 @@
         for j=1:size(count,1),
                 grids(count(j)).grid.z=bed(count(j))+grids(count(j)).grid.s*thickness(count(j));
+                grids(count(j)).grid.surface=bed(count(j))+thickness(count(j));
         end
 end

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

@@ -80 +80 @@
 
 %Computation of pressure with Pattyn's assumptions (P=rho_ice*g*(s-z) in Pa)
-u_g(4:6:m_dv.gridset.gsize)=md.rho_ice*md.g*(md.surface-md.z)/md.stokesreconditioning;
+pressure=zeros(length(fem.m_dv.grids),1);
+for i=1:length(fem.m_dv.grids),
+        pressure(i)=md.rho_ice*md.g*(fem.m_dv.grids(i).grid.surface-fem.m_dv.grids(i).grid.z)/md.stokesreconditioning;
+end
+        u_g(4:6:m_dv.gridset.gsize)=pressure;
 
 if fem.isstokes,