Changeset 16137 for issm/trunk/src/c/analyses/objectivefunction.cpp

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses (modified) (1 prop)
• src/c/analyses/objectivefunction.cpp (modified) (3 diffs)

issm/trunk

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/c

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp

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

@@ -24 +24 @@
         /*parameters: */
         int        solution_type,analysis_type;
-        bool       isstokes       = false;
+        bool       isFS       = false;
         bool       conserve_loads = true;
         FemModel  *femmodel       = NULL;
@@ -32 +32 @@
 
         /*Recover parameters: */
-        femmodel->parameters->FindParam(&isstokes,FlowequationIsstokesEnum);
+        femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
         femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
 
         /*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); 
         }

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ -14 +14 @@
 probe.results
 stXXXX*
-
+.deps
+.dirstamp