Changeset 14985

Timestamp:

05/09/13 09:36:22 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved solutions to analyses

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (9 diffs)
• analyses (moved) (moved from issm/trunk-jpl/src/c/solutions )
• analyses/AdjointCorePointerFromSolutionEnum.cpp (modified) (1 diff)
• analyses/AnalysisConfiguration.cpp (modified) (1 diff)
• analyses/CMakeLists.txt (modified) (1 diff)
• analyses/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• analyses/DakotaSpawnCore.cpp (modified) (1 diff)
• analyses/ResetBoundaryConditions.cpp (modified) (1 diff)
• analyses/WrapperCorePointerFromSolutionEnum.cpp (modified) (1 diff)
• analyses/ad_core.cpp (modified) (2 diffs)
• analyses/adjointbalancethickness_core.cpp (modified) (1 diff)
• analyses/adjointdiagnostic_core.cpp (modified) (1 diff)
• analyses/analyses.h (moved) (moved from issm/trunk-jpl/src/c/solutions/solutions.h ) (1 diff)
• analyses/balancethickness_core.cpp (modified) (1 diff)
• analyses/bedslope_core.cpp (modified) (1 diff)
• analyses/control_core.cpp (modified) (1 diff)
• analyses/controlconvergence.cpp (modified) (1 diff)
• analyses/controlrestart.cpp (modified) (1 diff)
• analyses/controltao_core.cpp (modified) (1 diff)
• analyses/dakota_core.cpp (modified) (1 diff)
• analyses/diagnostic_core.cpp (modified) (1 diff)
• analyses/dummy_core.cpp (modified) (1 diff)
• analyses/enthalpy_core.cpp (modified) (1 diff)
• analyses/gia_core.cpp (modified) (1 diff)
• analyses/gradient_core.cpp (modified) (1 diff)
• analyses/hydrology_core.cpp (modified) (1 diff)
• analyses/objectivefunction.cpp (modified) (1 diff)
• analyses/prognostic_core.cpp (modified) (1 diff)
• analyses/steadystate_core.cpp (modified) (1 diff)
• analyses/steadystateconvergence.cpp (modified) (1 diff)
• analyses/surfaceslope_core.cpp (modified) (1 diff)
• analyses/thermal_core.cpp (modified) (1 diff)
• analyses/transient_core.cpp (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/dakota/DakotaPlugin.cpp (modified) (1 diff)
• main/issm.h (modified) (1 diff)
• solvers/solver_newton.cpp (modified) (2 diffs)
• solvers/solver_nonlinear.cpp (modified) (2 diffs)
• solvers/solver_stokescoupling_nonlinear.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -322 +322 @@
                                         ./modules/InputConvergencex/InputConvergencex.cpp\
                                         ./modules/InputConvergencex/InputConvergencex.h\
-                                        ./solutions/convergence.cpp\
-                                        ./solutions/ProcessArguments.cpp\
-                                        ./solutions/ResetBoundaryConditions.cpp\
-                                        ./solutions/AnalysisConfiguration.cpp\
-                                        ./solutions/WrapperCorePointerFromSolutionEnum.cpp\
-                                        ./solutions/CorePointerFromSolutionEnum.cpp\
-                                        ./solutions/EnvironmentInit.cpp\
-                                        ./solutions/EnvironmentFinalize.cpp\
-                                        ./solutions/ad_core.cpp\
+                                        ./analyses/convergence.cpp\
+                                        ./analyses/ProcessArguments.cpp\
+                                        ./analyses/ResetBoundaryConditions.cpp\
+                                        ./analyses/AnalysisConfiguration.cpp\
+                                        ./analyses/WrapperCorePointerFromSolutionEnum.cpp\
+                                        ./analyses/CorePointerFromSolutionEnum.cpp\
+                                        ./analyses/EnvironmentInit.cpp\
+                                        ./analyses/EnvironmentFinalize.cpp\
+                                        ./analyses/ad_core.cpp\
                                         ./solvers/solver_linear.cpp\
                                         ./solvers/solver_nonlinear.cpp\
@@ -353 +353 @@
                                           ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
                                           ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
-                                          ./solutions/dakota_core.cpp\
-                                          ./solutions/DakotaSpawnCore.h\
-                                          ./solutions/DakotaSpawnCore.cpp
+                                          ./analyses/dakota_core.cpp\
+                                          ./analyses/DakotaSpawnCore.h\
+                                          ./analyses/DakotaSpawnCore.cpp
 #}}}
 #Transient sources  {{{
 transient_sources  = ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp \
-                                         ./solutions/transient_core.cpp
+                                                        ./analyses/transient_core.cpp
 #}}}
 #Steadystate sources  {{{
-steadystate_sources = ./solutions/steadystate_core.cpp\
-                                          ./solutions/steadystateconvergence.cpp
+steadystate_sources = ./analyses/steadystate_core.cpp\
+                                                         ./analyses/steadystateconvergence.cpp
 #}}}
 #Prognostic sources  {{{
@@ -370 +370 @@
                                               ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\
                                               ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\
-                                                  ./solutions/prognostic_core.cpp
+                                                        ./analyses/prognostic_core.cpp
 #}}}
 #Thermal sources  {{{
@@ -388 +388 @@
                                            ./modules/ConstraintsStatex/ThermalIsPresent.cpp\
                                            ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp \
-                                           ./solutions/thermal_core.cpp\
-                                           ./solutions/enthalpy_core.cpp\
+                                           ./analyses/thermal_core.cpp\
+                                           ./analyses/enthalpy_core.cpp\
                                            ./solvers/solver_thermal_nonlinear.cpp
 #}}}
@@ -435 +435 @@
                                           ./shared/Numerics/BrentSearch.cpp\
                                           ./shared/Numerics/OptimalSearch.cpp \
-                                          ./solutions/control_core.cpp\
-                                          ./solutions/controltao_core.cpp\
-                                          ./solutions/controlrestart.cpp\
-                                          ./solutions/controlconvergence.cpp\
-                                          ./solutions/objectivefunction.cpp\
-                                          ./solutions/gradient_core.cpp\
-                                          ./solutions/adjointdiagnostic_core.cpp\
-                                          ./solutions/adjointbalancethickness_core.cpp\
-                                          ./solutions/AdjointCorePointerFromSolutionEnum.cpp\
+                                          ./analyses/control_core.cpp\
+                                          ./analyses/controltao_core.cpp\
+                                          ./analyses/controlrestart.cpp\
+                                          ./analyses/controlconvergence.cpp\
+                                          ./analyses/objectivefunction.cpp\
+                                          ./analyses/gradient_core.cpp\
+                                          ./analyses/adjointdiagnostic_core.cpp\
+                                          ./analyses/adjointbalancethickness_core.cpp\
+                                          ./analyses/AdjointCorePointerFromSolutionEnum.cpp\
                                           ./solvers/solver_adjoint_linear.cpp
 
@@ -463 +463 @@
                                                         ./modules/ModelProcessorx/HydrologyDCEfficient/CreateLoadsHydrologyDCEfficient.cpp \
                                                         ./modules/ModelProcessorx/HydrologyDCEfficient/CreateParametersHydrologyDCEfficient.cpp \
-                                                  ./solutions/hydrology_core.cpp\
-                                                  ./solvers/solver_hydro_nonlinear.cpp
+                                                        ./analyses/hydrology_core.cpp\
+                                                        ./solvers/solver_hydro_nonlinear.cpp
 #}}}
 #Diagnostic sources  {{{
@@ -478 +478 @@
                                               ./modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp \
                                               ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \
-                                              ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp \
-                                                  ./solutions/diagnostic_core.cpp\
-                                                  ./solvers/solver_stokescoupling_nonlinear.cpp
+                                                        ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp \
+                                                        ./analyses/diagnostic_core.cpp\
+                                                        ./solvers/solver_stokescoupling_nonlinear.cpp
 #}}}
 #Balanced sources  {{{
@@ -486 +486 @@
                                             ./modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp\
                                             ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp\
-                                                ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp\
-                                                ./solutions/balancethickness_core.cpp \
-                                                ./solutions/dummy_core.cpp
+                                                 ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp\
+                                                 ./analyses/balancethickness_core.cpp \
+                                                 ./analyses/dummy_core.cpp
 #}}}
 #Slope sources  {{{
@@ -499 +499 @@
                                           ./modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp\
                                           ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp\
-                                          ./solutions/surfaceslope_core.cpp\
-                                          ./solutions/bedslope_core.cpp
+                                          ./analyses/surfaceslope_core.cpp\
+                                          ./analyses/bedslope_core.cpp
 #}}}
 #Gia sources  {{{
-gia_sources =  ./solutions/gia_core.cpp\
-                           ./modules/ModelProcessorx/Gia/UpdateElementsGia.cpp\
-                           ./modules/ModelProcessorx/Gia/CreateNodesGia.cpp \
-                           ./modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp\
-                           ./modules/ModelProcessorx/Gia/CreateLoadsGia.cpp\
-                           ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\
-                           ./modules/GiaDeflectionCorex/GiaDeflectionCorex.h\
-                           ./modules/GiaDeflectionCorex/distme.f\
-                           ./modules/GiaDeflectionCorex/freed.f\
-                           ./modules/GiaDeflectionCorex/ojrule.f\
-                           ./modules/GiaDeflectionCorex/pwise.f\
-                           ./modules/GiaDeflectionCorex/qwise.f\
-                           ./modules/GiaDeflectionCorex/stot.f\
-                           ./modules/GiaDeflectionCorex/what0.f\
-                           ./classes/GiaDeflectionCoreArgs.h
+gia_sources =  ./analyses/gia_core.cpp\
+                                        ./modules/ModelProcessorx/Gia/UpdateElementsGia.cpp\
+                                        ./modules/ModelProcessorx/Gia/CreateNodesGia.cpp \
+                                        ./modules/ModelProcessorx/Gia/CreateConstraintsGia.cpp\
+                                        ./modules/ModelProcessorx/Gia/CreateLoadsGia.cpp\
+                                        ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\
+                                        ./modules/GiaDeflectionCorex/GiaDeflectionCorex.h\
+                                        ./modules/GiaDeflectionCorex/distme.f\
+                                        ./modules/GiaDeflectionCorex/freed.f\
+                                        ./modules/GiaDeflectionCorex/ojrule.f\
+                                        ./modules/GiaDeflectionCorex/pwise.f\
+                                        ./modules/GiaDeflectionCorex/qwise.f\
+                                        ./modules/GiaDeflectionCorex/stot.f\
+                                        ./modules/GiaDeflectionCorex/what0.f\
+                                        ./classes/GiaDeflectionCoreArgs.h
 
 #}}}

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

@@ -9 +9 @@
 #endif
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -9 +9 @@
 #endif
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

issm/trunk-jpl/src/c/analyses/CMakeLists.txt

@@ -58 +58 @@
 # }}}
 # ISSMROSE_EXE_SOURCES {{{
-set(ISSMROSE_EXE_SOURCES $ENV{ISSM_DIR}/src/c/solutions/issm.cpp PARENT_SCOPE)
+set(ISSMROSE_EXE_SOURCES $ENV{ISSM_DIR}/src/c/main/issm.cpp PARENT_SCOPE)
 # }}}

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

@@ -9 +9 @@
 #endif
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -27 +27 @@
 #endif
 
+#include "./analyses.h"
 #include "../classes/objects/objects.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "../shared/shared.h"
-#include "../solutions/solutions.h"
 #include "../modules/modules.h"
 
 void DakotaMPI_Bcast(double** pvariables, char*** pvariables_descriptors,int* pnumvariables, int* pnumresponses);
 void DakotaFree(double** pvariables,char*** pvariables_descriptors,char*** presponses_descriptors,int numvariables,int numresponses);
-
 /*}}}*/
 

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

@@ -6 +6 @@
 #include "../modules/modules.h"
 #include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
 
 void ResetBoundaryConditions(FemModel* femmodel, int analysis_type){

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

@@ -8 +8 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -11 +11 @@
 
 #include <set>
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
@@ -16 +17 @@
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

issm/trunk-jpl/src/c/analyses/analyses.h

@@ -1 +1 @@
 /*
- * solutions.h: 
+ * analyses.h: 
  */
 
-#ifndef SOLUTIONS_H_
-#define SOLUTIONS_H_
+#ifndef _ANALYSES_H_
+#define _ANALYSES_H_
 
 /*forward declarations: */

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -3 +3 @@
  */ 
 
-#include "./solutions.h"
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -8 +8 @@
 #endif
 
+#include "./analyses.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../Container/Container.h"
 #include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"
-#include "./solutions.h"
 
 bool controlconvergence(IssmDouble J, IssmDouble tol_cm){

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

@@ -3 +3 @@
  */ 
 
-#include "./solutions.h"
+#include "./analyses.h"
 #include "../modules/modules.h"
 #include "../shared/Enum/Enum.h"

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

@@ -3 +3 @@
  */ 
 #include <config.h>
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -34 +34 @@
 #endif
 
-#include "./solutions.h"
-#include "../shared/shared.h"
+#include "./analyses.h"
 #include "../shared/io/io.h"
 #include "../toolkits/toolkits.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -3 +3 @@
  */ 
 
-#include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/shared.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
-#include "./solutions.h"
-#include "../modules/modules.h"
-#include "../solvers/solvers.h"
+class FemModel;
 
 void dummy_core(FemModel* femmodel){

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../shared/io/io.h"

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

@@ -3 +3 @@
  */ 
 
-#include "./solutions.h"
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -9 +9 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/Enum/Enum.h"
 #include "../solvers/solvers.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 /*}}}*/

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -8 +8 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -8 +8 @@
 #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!"
 #endif
-
+#include "./analyses.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../Container/Container.h"
 #include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"
-#include "./solutions.h"
 
 bool steadystateconvergence(FemModel* femmodel){

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

@@ -3 +3 @@
  */ 
 
-#include "./solutions.h"
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"

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

@@ -3 +3 @@
  */ 
 
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"

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

@@ -9 +9 @@
 #endif
 
+#include <float.h>
+#include "./analyses.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
-#include "../shared/shared.h"
 #include "../shared/io/io.h"
 #include "../shared/Enum/Enum.h"
-#include "./solutions.h"
 #include "../modules/modules.h"
 #include "../solvers/solvers.h"
-#include <float.h>
 
 void transient_core(FemModel* femmodel){

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -11 +11 @@
 #include <stdio.h>
 #include "../Container/Container.h"
-#include "../solutions/solutions.h"
+#include "../analyses/analyses.h"
 #include "../shared/io/io.h"
 #include "./classes.h"

issm/trunk-jpl/src/c/classes/dakota/DakotaPlugin.cpp

@@ -27 +27 @@
 #include "../../shared/Numerics/types.h"
 #include "../../shared/MemOps/MemOps.h"
-#include "../../solutions/DakotaSpawnCore.h"
+#include "../../analyses/DakotaSpawnCore.h"
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.

issm/trunk-jpl/src/c/main/issm.h

@@ -18 +18 @@
 #include "../shared/Enum/Enum.h"
 #include "../toolkits/toolkits.h"
-#include "../solutions/solutions.h"
+#include "../analyses/analyses.h"
 #include "../solvers/solvers.h"
 #include "../modules/modules.h"

issm/trunk-jpl/src/c/solvers/solver_newton.cpp

@@ -3 +3 @@
  */ 
 
+#include "./solvers.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
@@ -8 +9 @@
 #include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"
-#include "../solutions/solutions.h"
-#include "./solvers.h"
+#include "../analyses/analyses.h"
 
 void solver_newton(FemModel* femmodel){

issm/trunk-jpl/src/c/solvers/solver_nonlinear.cpp

@@ -3 +3 @@
  */ 
 
+#include "./solvers.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
@@ -8 +9 @@
 #include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"
-#include "../solutions/solutions.h"
-#include "./solvers.h"
+#include "../analyses/analyses.h"
 
 void solver_nonlinear(FemModel* femmodel,bool conserve_loads){

issm/trunk-jpl/src/c/solvers/solver_stokescoupling_nonlinear.cpp

@@ -3 +3 @@
  */ 
 
+#include "./solvers.h"
 #include "../toolkits/toolkits.h"
 #include "../classes/objects/objects.h"
@@ -8 +9 @@
 #include "../shared/io/io.h"
 #include "../modules/modules.h"
-#include "../solutions/solutions.h"
-#include "./solvers.h"
+#include "../analyses/analyses.h"
 
 void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads){