Changeset 13806

Timestamp:

10/22/12 18:54:30 (12 years ago)

Author:

Eric.Larour

Message:

CHG: update of rifting capabilities

Location:

issm/trunk-jpl/src/m

Files:

• contrib/hack/tres.m (modified) (1 diff)
• mesh/rifts/meshprocessoutsiderifts.m (modified) (2 diffs)
• mesh/rifts/rifttipsonmesh.m (modified) (1 diff)

issm/trunk-jpl/src/m/contrib/hack/tres.m

@@ -22 +22 @@
                 md.initialization.pressure=md.results.DiagnosticSolution.Pressure;
         end
-        if md.rifts.numrifts,
+        if ~isempty(md.rifts.riftstruct),
                 if isfield(md.results.DiagnosticSolution,'riftproperties'),
                         md.rifts.riftproperties=md.results.DiagnosticSolution.riftproperties;
-                end
-        end
-        if md.inversion.iscontrol==1,
-                for control_parameters=md.inversion.control_parameters
-                        %Will need to be updated... good luck ;)
-                        md.(EnumToModelField(control_parameters))=md.results.DiagnosticSolution.(EnumToString(control_parameters));
                 end
         end

issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.m

@@ -7 +7 @@
 
 %go through rifts, and figure out which ones touch the domain outline
-for i=1:md.rifts.numrifts,
+for i=1:length(md.rifts.riftstruct),
 
         %first, flag nodes that belong to the domain outline
@@ -84 +84 @@
 md.mesh.z=zeros(md.mesh.numberofvertices,1);
 md.mesh.vertexonboundary=zeros(length(md.mesh.x),1); md.mesh.vertexonboundary(md.mesh.segments(:,1:2))=1;
-md.rifts.numrifts=length(md.rifts.riftstruct);
 md.flowequation.element_equation=3*ones(md.mesh.numberofelements,1);
 md.mesh.vertexonbed=ones(md.mesh.numberofvertices,1);

issm/trunk-jpl/src/m/mesh/rifts/rifttipsonmesh.m

@@ -4 +4 @@
 
 %read rifts from outline file
-rifts=expread(riftoutline,1);
+rifts=expread(riftoutline);
 
 tips=[];