Changeset 1629 for issm/trunk

Timestamp:

08/10/09 17:16:52 (16 years ago)

Author:

Eric.Larour

Message:

Added rifts formulation in 2d diagnostic. more to be tested

Location:

issm/trunk/src

Files:

• m/classes/@model/model.m (modified) (1 diff)
• m/classes/public/marshall.m (modified) (1 diff)
• m/classes/public/presolve.m (added)
• m/classes/public/solve.m (modified) (1 diff)
• m/solutions/cielo/diagnostic.m (modified) (1 diff)
• mex/ModelProcessor/ModelProcessor.cpp (modified) (1 diff)

issm/trunk/src/m/classes/@model/model.m

@@ -75 +75 @@
         md.segmentmarkers=NaN;
         md.rifts=NaN;
+        md.riftinfo=NaN;
         md.numrifts=0;
 

issm/trunk/src/m/classes/public/marshall.m

@@ -151 +151 @@
 
 %Rifts
-WriteData(fid,md.numrifts,'Integer','numrifts');
-for i=1:md.numrifts,
-        WriteData(fid,md.rifts(i).penaltypairs,'Mat',['penaltypairs' num2str(i)]);
-        WriteData(fid,md.rifts(i).fill,'Scalar',['fill' num2str(i)]);
-        WriteData(fid,md.rifts(i).friction,'Scalar',['friction' num2str(i)]);
-end
+WriteData(fid,md.riftinfo,'Mat','riftinfo');
 
 %Qmu: the rest will be handle by qmumarshall

issm/trunk/src/m/classes/public/solve.m

@@ -36 +36 @@
         error(' '); %previous error messages should explain what is going on.
 end
+
+%preprocesses model before solving
+md=presolve(md);
 
 %if running qmu analysis, some preprocessing of dakota files using 

issm/trunk/src/m/solutions/cielo/diagnostic.m

@@ -20 +20 @@
         displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
         md.analysis_type='diagnostic'; md.sub_analysis_type='stokes'; models.ds=CreateFemModel(md);
-
+        
         displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
         md.analysis_type='diagnostic'; md.sub_analysis_type='hutter'; models.dhu=CreateFemModel(md);

issm/trunk/src/mex/ModelProcessor/ModelProcessor.cpp

@@ -33 +33 @@
         /*Create elements, nodes and materials: */
         CreateDataSets(&elements,&nodes,&materials,&constraints, &loads, &parameters, model,MODEL);
+        
         /*Write output data: */
         WriteData(ELEMENTS,elements,0,0,"DataSet",NULL);