Changeset 14895

Timestamp:

05/04/13 22:14:48 (12 years ago)

Author:

Eric.Larour

Message:

CHG: all these modules were uselessly including modules.h, which created useless bridges between modules and modules.h. Took this out

Location:

issm/trunk-jpl/src/c/modules

Files:

• AverageOntoPartitionx/AverageOntoPartitionx.cpp (modified) (1 diff)
• Exp2Kmlx/Exp2Kmlx.cpp (modified) (1 diff)
• Gradjx/Gradjx.cpp (modified) (1 diff)
• InputUpdateFromDakotax/InputUpdateFromDakotax.cpp (modified) (1 diff)
• InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp (modified) (1 diff)
• InterpFromMesh2dx/InterpFromMesh2dx.cpp (modified) (1 diff)
• InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp (modified) (1 diff)
• Kml2Expx/Kml2Expx.cpp (modified) (1 diff)
• ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp (modified) (2 diffs)
• ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (modified) (1 diff)
• ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp (modified) (1 diff)
• ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (modified) (1 diff)
• ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (modified) (1 diff)
• ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp (modified) (1 diff)
• ModelProcessorx/Gia/UpdateElementsGia.cpp (modified) (1 diff)
• ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp (modified) (2 diffs)
• ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp (modified) (1 diff)
• ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp (modified) (2 diffs)
• ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (modified) (1 diff)
• ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp (modified) (2 diffs)
• ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp (modified) (1 diff)
• ModelProcessorx/Melting/UpdateElementsMelting.cpp (modified) (1 diff)
• ModelProcessorx/ModelProcessorx.cpp (modified) (1 diff)
• ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp (modified) (2 diffs)
• ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp (modified) (1 diff)
• ModelProcessorx/Thermal/CreateConstraintsThermal.cpp (modified) (2 diffs)
• ModelProcessorx/Thermal/UpdateElementsThermal.cpp (modified) (1 diff)
• ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)
• ResetConstraintsx/ResetConstraintsx.cpp (modified) (2 diffs)
• Shp2Expx/Shp2Expx.cpp (modified) (1 diff)
• Shp2Kmlx/Shp2Kmlx.cpp (modified) (1 diff)
• TriaSearchx/TriaSearchx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp

@@ -16 +16 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../toolkits/toolkits.h"
-#include "../modules.h"
 
 void AverageOntoPartitionx(double** paverage, Elements* elements, Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vertex_response){

issm/trunk-jpl/src/c/modules/Exp2Kmlx/Exp2Kmlx.cpp

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../modules.h"
+#include "../Xy2llx/Xy2llx.h"
 
 int Exp2Kmlx(char* filexp,char* filkml,int sgn,bool holes){

issm/trunk-jpl/src/c/modules/Gradjx/Gradjx.cpp

@@ -4 +4 @@
 
 #include "./Gradjx.h"
-#include "../modules.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"

issm/trunk-jpl/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../modules.h"
+#include "../InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.h"
+#include "../InputUpdateFromConstantx/InputUpdateFromConstantx.h"
+#include "../InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h"
 
 void  InputUpdateFromDakotax(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials*  materials,Parameters* parameters,double* variables,char* *variables_descriptors,int numvariables){

issm/trunk-jpl/src/c/modules/InputUpdateFromMatrixDakotax/InputUpdateFromMatrixDakotax.cpp

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../modules.h"
+#include "../InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h"
 
 void InputUpdateFromMatrixDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* matrix,int nrows,int ncols, int name, int type){

issm/trunk-jpl/src/c/modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/objects/objects.h"
-#include "../modules.h"
+#include "../ContourToNodesx/ContourToNodesx.h"
+
 
 int InterpFromMesh2dx(IssmSeqVec<IssmPDouble>** pdata_prime,

issm/trunk-jpl/src/c/modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/objects/objects.h"
-#include "../modules.h"
 
 using namespace bamg;

issm/trunk-jpl/src/c/modules/Kml2Expx/Kml2Expx.cpp

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../modules.h"
+#include "../Ll2xyx/Ll2xyx.h"
+#include "../KMLFileReadx/KMLFileReadx.h"
 
 int Kml2Expx(char* filkml,char* filexp,

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp

@@ -1 +1 @@
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../toolkits/toolkits.h"
@@ -7 +6 @@
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"
+#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h"
 
 void    CreateConstraintsBalancethickness(Constraints** pconstraints, IoModel* iomodel){

issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

@@ -5 +5 @@
 #include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

@@ -5 +5 @@
 #include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -9 +9 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"
-#include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"
-#include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp

@@ -7 +7 @@
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
-#include "../../../modules/modules.h"
 #include "../../../classes/objects/objects.h"
 #include "../../../shared/shared.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Gia/UpdateElementsGia.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/CreateConstraintsHydrologyDCEfficient.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
@@ -11 +10 @@
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"
+#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h"
 
 void    CreateConstraintsHydrologyDCEfficient(Constraints** pconstraints, IoModel* iomodel){

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"
-#include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/CreateConstraintsHydrologyDCInefficient.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
@@ -11 +10 @@
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"
+#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h"
 
 void    CreateConstraintsHydrologyDCInefficient(Constraints** pconstraints, IoModel* iomodel){

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"
-#include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/CreateConstraintsHydrologyShreve.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
@@ -11 +10 @@
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"
+#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h"
 
 void    CreateConstraintsHydrologyShreve(Constraints** pconstraints, IoModel* iomodel){

issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyShreve/UpdateElementsHydrologyShreve.cpp

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"
-#include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp

@@ -5 +5 @@
 #include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -15 +15 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../include/include.h"
-#include "../../modules/modules.h"
+#include "./ModelProcessorx.h"
 
 void ModelProcessorx(Elements** pelements, Nodes** pnodes, Vertices** pvertices, Materials** pmaterials, Constraints** pconstraints, Loads** ploads, Parameters** pparameters, FILE* IOMODEL,char* rootpath,const int solution_type,const int nummodels,const int* analysis_type_list){

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp

@@ -1 +1 @@
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
@@ -7 +6 @@
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"
+#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h"
 
 void    CreateConstraintsPrognostic(Constraints** pconstraints, IoModel* iomodel){

issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -5 +5 @@
 #include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp

@@ -5 +5 @@
 #include "../../../Container/Container.h"
 #include "../../../toolkits/toolkits.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../io/io.h"
 #include "../../../toolkits/toolkits.h"
@@ -11 +10 @@
 #include "../../../shared/shared.h"
 #include "../ModelProcessorx.h"
+#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h"
 
 void    CreateConstraintsThermal(Constraints** pconstraints, IoModel* iomodel){

issm/trunk-jpl/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

@@ -4 +4 @@
 
 #include "../../../Container/Container.h"
-#include "../../../modules/modules.h"
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"

issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -6 +6 @@
 #include "../../../toolkits/toolkits.h"
 #include "../../../io/io.h"
-#include "../../../modules/modules.h"
 #include "../../../EnumDefinitions/EnumDefinitions.h"
 #include "../../../classes/objects/objects.h"

issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp

@@ -4 +4 @@
 
 #include "./ResetConstraintsx.h"
-#include "../modules.h"
 #include "../../shared/shared.h"
 #include "../../io/io.h"
@@ -10 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../ConstraintsStatex/ConstraintsStatex.h"
 
 void ResetConstraintsx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters){

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../modules.h"
 
 int Shp2Expx(char* filshp,char* filexp){

issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

@@ -9 +9 @@
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
-#include "../modules.h"
 
 int Shp2Kmlx(char* filshp,char* filkml,

issm/trunk-jpl/src/c/modules/TriaSearchx/TriaSearchx.cpp

@@ -8 +8 @@
 #include "../../toolkits/toolkits.h"
 #include "../../classes/objects/objects.h"
-#include "../modules.h"
 
 using namespace bamg;