Changeset 15771 for issm/trunk-jpl/src/c/analyses/objectivefunction.cpp

Timestamp:

08/09/13 10:59:47 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: Diagnostic is now Stressbalance

File:

• issm/trunk-jpl/src/c/analyses/objectivefunction.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/objectivefunction.cpp

@@ -37 +37 @@
 
         /*set analysis type to compute velocity: */
-        if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){
-                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
+        if (solution_type==SteadystateSolutionEnum || solution_type==StressbalanceSolutionEnum){
+                femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
         }
         else if (solution_type==BalancethicknessSolutionEnum){
@@ -53 +53 @@
         InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,false);
 
-        /*Run diagnostic with updated inputs: */
+        /*Run stressbalance with updated inputs: */
         if (solution_type==SteadystateSolutionEnum){
-                diagnostic_core(femmodel);      //We need a 3D velocity!! (vz is required for the next thermal run)
+                stressbalance_core(femmodel);   //We need a 3D velocity!! (vz is required for the next thermal run)
         }
-        else if (solution_type==DiagnosticSolutionEnum){
+        else if (solution_type==StressbalanceSolutionEnum){
                 solutionsequence_nonlinear(femmodel,conserve_loads); 
         }