Changeset 15001

Timestamp:

05/10/13 00:20:08 (12 years ago)

Author:

Eric.Larour

Message:

CHG: analyses should also only include shared/shared.h and classes/classes.h

Location:

issm/trunk-jpl/src/c/analyses

Files:

• AdjointCorePointerFromSolutionEnum.cpp (modified) (1 diff)
• AnalysisConfiguration.cpp (modified) (1 diff)
• CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• DakotaSpawnCore.cpp (modified) (1 diff)
• ResetBoundaryConditions.cpp (modified) (1 diff)
• WrapperCorePointerFromSolutionEnum.cpp (modified) (1 diff)
• ad_core.cpp (modified) (1 diff)
• adjointbalancethickness_core.cpp (modified) (1 diff)
• adjointdiagnostic_core.cpp (modified) (1 diff)
• balancethickness_core.cpp (modified) (1 diff)
• bedslope_core.cpp (modified) (1 diff)
• control_core.cpp (modified) (1 diff)
• controlconvergence.cpp (modified) (1 diff)
• controlrestart.cpp (modified) (1 diff)
• controltao_core.cpp (modified) (1 diff)
• convergence.cpp (modified) (1 diff)
• dakota_core.cpp (modified) (1 diff)
• diagnostic_core.cpp (modified) (1 diff)
• enthalpy_core.cpp (modified) (1 diff)
• gia_core.cpp (modified) (1 diff)
• gradient_core.cpp (modified) (1 diff)
• hydrology_core.cpp (modified) (1 diff)
• objectivefunction.cpp (modified) (1 diff)
• prognostic_core.cpp (modified) (1 diff)
• steadystate_core.cpp (modified) (1 diff)
• steadystateconvergence.cpp (modified) (1 diff)
• surfaceslope_core.cpp (modified) (1 diff)
• thermal_core.cpp (modified) (1 diff)
• transient_core.cpp (modified) (1 diff)

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

@@ -11 +11 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -11 +11 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -11 +11 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -28 +28 @@
 
 #include "./analyses.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 

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

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

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

@@ -10 +10 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -13 +13 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
+#include "../classes/classes.h"
 #include "../shared/shared.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -9 +9 @@
 
 #include "./analyses.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../modules/modules.h"
-#include "../shared/Enum/Enum.h"
+#include "../shared/shared.h"
 
 void controlrestart(FemModel* femmodel,IssmDouble* J){

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -3 +3 @@
  */ 
 
-#include "../classes/objects/objects.h"
+#include "../classes/classes.h"
 #include "../modules/modules.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../shared/shared.h"
 
 void convergence(bool* pconverged, Matrix<IssmDouble>* Kff,Vector<IssmDouble>* pf,Vector<IssmDouble>* uf,Vector<IssmDouble>* old_uf,Parameters* parameters){

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

@@ -35 +35 @@
 
 #include "./analyses.h"
-#include "../shared/io/io.h"
 #include "../toolkits/toolkits.h"
-#include "../shared/Enum/Enum.h"
-#include "../classes/classes.h"
+#include "../shared/shared.h"
+#include "../classes/object/objects.h"
 
 #ifdef _HAVE_DAKOTA_ //only works if dakota library has been compiled in.

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
 #include "../modules/modules.h"
-#include "../shared/io/io.h"
+#include "../shared/shared.h"
 #include "../solutionsequences/solutionsequences.h"
 

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -11 +11 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../solutionsequences/solutionsequences.h"
 #include "../modules/modules.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -10 +10 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

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

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../solutionsequences/solutionsequences.h"
 #include "../modules/modules.h"

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

@@ -5 +5 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"

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

@@ -12 +12 @@
 #include "./analyses.h"
 #include "../toolkits/toolkits.h"
-#include "../classes/objects/objects.h"
-#include "../shared/io/io.h"
-#include "../shared/Enum/Enum.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"