Changeset 13975 for issm/trunk/src/c/solutions/diagnostic_core.cpp

Timestamp:

11/16/12 08:10:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13974

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c/solutions/diagnostic_core.cpp (modified) (4 diffs)

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -60 +60 @@
 
         if(ishutter){
-                        
+
                 if(VerboseSolution()) _pprintLine_("   computing hutter velocities");
 
@@ -68 +68 @@
                 femmodel->SetCurrentConfiguration(DiagnosticHutterAnalysisEnum);
                 solver_linear(femmodel);
-                
+
                 if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum);
         }
 
         if ((ismacayealpattyn || isl1l2) ^ isstokes){ // ^ = xor
-                
+
                 if(VerboseSolution()) _pprintLine_("   computing velocities");
                 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
@@ -95 +95 @@
         }
 
-
         if(save_results){
                 if(VerboseSolution()) _pprintLine_("   saving results");
@@ -103 +102 @@
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
                 if(dim==3) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzEnum);
-                RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
+                femmodel->RequestedOutputsx(requested_outputs,numoutputs);
         }
+
+        if(solution_type==DiagnosticSolutionEnum)femmodel->RequestedDependentsx();
 
         /*Free ressources:*/