Changeset 11315

Timestamp:

02/03/12 12:08:36 (13 years ago)

Author:

schlegel

Message:

Additions for 3d dakota

Location:

issm/trunk-jpl/src/m/model

Files:

• extrude.m (modified) (2 diffs)
• partition/partitioner.m (modified) (1 diff)

issm/trunk-jpl/src/m/model/extrude.m

@@ -194 +194 @@
 for i=2:numlayers-1,
         md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)...
-        =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d;
+                =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d;
 end
 md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
@@ -216 +216 @@
 md.mask.vertexonwater=project3d(md,'vector',md.mask.vertexonwater,'type','node');
 if ~isnan(md.inversion.cost_functions_coefficients),md.inversion.cost_functions_coefficients=project3d(md,'vector',md.inversion.cost_functions_coefficients,'type','node');end;
-
-%Put lithostatic pressure is there is an existing pressure
+if ~isnan(md.qmu.partition),md.qmu.partition=project3d(md,'vector',md.qmu.partition','type','node');end
+
+%Put lithostatic pressure if there is an existing pressure
 if ~isnan(md.initialization.pressure),
         md.initialization.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z);

issm/trunk-jpl/src/m/model/partition/partitioner.m

@@ -99 +99 @@
 %extrude if we are in 3D:
 if md.mesh.dimension==3,
+        md3d.qmu.vertex_weight=md.qmu.vertex_weight;
+        md3d.qmu.adjacency=md.qmu.adjacency;
         md=md3d;
         part=project3d(md,'vector',part','type','node');