Changeset 11315


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/model/extrude.m

    r11234 r11315  
    194194for i=2:numlayers-1,
    195195        md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)...
    196         =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d;
     196                =md.mesh.elementconnectivity((i-1)*md.mesh.numberofelements2d+1:(i)*md.mesh.numberofelements2d,:)+md.mesh.numberofelements2d;
    197197end
    198198md.mesh.elementconnectivity(find(isnan(md.mesh.elementconnectivity)))=0;
     
    216216md.mask.vertexonwater=project3d(md,'vector',md.mask.vertexonwater,'type','node');
    217217if ~isnan(md.inversion.cost_functions_coefficients),md.inversion.cost_functions_coefficients=project3d(md,'vector',md.inversion.cost_functions_coefficients,'type','node');end;
    218 
    219 %Put lithostatic pressure is there is an existing pressure
     218if ~isnan(md.qmu.partition),md.qmu.partition=project3d(md,'vector',md.qmu.partition','type','node');end
     219
     220%Put lithostatic pressure if there is an existing pressure
    220221if ~isnan(md.initialization.pressure),
    221222        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

    r10232 r11315  
    9999%extrude if we are in 3D:
    100100if md.mesh.dimension==3,
     101        md3d.qmu.vertex_weight=md.qmu.vertex_weight;
     102        md3d.qmu.adjacency=md.qmu.adjacency;
    101103        md=md3d;
    102104        part=project3d(md,'vector',part','type','node');
Note: See TracChangeset for help on using the changeset viewer.