Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 3894) +++ /issm/trunk/src/c/Makefile.am (revision 3895) @@ -836,29 +836,29 @@ ./OutputRiftsx/OutputRiftsx.h\ ./OutputRiftsx/OutputRiftsx.cpp\ - ./parallel/diagnostic_core.cpp\ - ./parallel/diagnostic_core_linear.cpp\ - ./parallel/diagnostic_core_nonlinear.cpp\ - ./parallel/convergence.cpp\ - ./parallel/thermal_core.cpp\ - ./parallel/thermal_core_nonlinear.cpp\ - ./parallel/WriteLockFile.cpp\ - ./parallel/control_core.cpp\ - ./parallel/ControlInitialization.cpp\ - ./parallel/ControlRestart.cpp\ - ./parallel/objectivefunctionC.cpp\ - ./parallel/gradjcompute_core.cpp\ - ./parallel/ProcessResults.cpp\ - ./parallel/prognostic_core.cpp\ - ./parallel/prognostic2_core.cpp\ - ./parallel/balancedthickness_core.cpp\ - ./parallel/balancedthickness2_core.cpp\ - ./parallel/balancedvelocities_core.cpp\ - ./parallel/slopecompute_core.cpp\ - ./parallel/slope_core.cpp\ - ./parallel/transient_core.cpp\ - ./parallel/transient_core_2d.cpp\ - ./parallel/transient_core_3d.cpp\ - ./parallel/steadystate_core.cpp\ - ./parallel/OutputResults.cpp\ + ./solutions/diagnostic_core.cpp\ + ./solutions/diagnostic_core_linear.cpp\ + ./solutions/diagnostic_core_nonlinear.cpp\ + ./solutions/convergence.cpp\ + ./solutions/thermal_core.cpp\ + ./solutions/thermal_core_nonlinear.cpp\ + ./solutions/WriteLockFile.cpp\ + ./solutions/control_core.cpp\ + ./solutions/ControlInitialization.cpp\ + ./solutions/ControlRestart.cpp\ + ./solutions/objectivefunctionC.cpp\ + ./solutions/gradjcompute_core.cpp\ + ./solutions/ProcessResults.cpp\ + ./solutions/prognostic_core.cpp\ + ./solutions/prognostic2_core.cpp\ + ./solutions/balancedthickness_core.cpp\ + ./solutions/balancedthickness2_core.cpp\ + ./solutions/balancedvelocities_core.cpp\ + ./solutions/slopecompute_core.cpp\ + ./solutions/slope_core.cpp\ + ./solutions/transient_core.cpp\ + ./solutions/transient_core_2d.cpp\ + ./solutions/transient_core_3d.cpp\ + ./solutions/steadystate_core.cpp\ + ./solutions/OutputResults.cpp\ ./Bamgx/Bamgx.cpp\ ./Bamgx/Bamgx.h\ @@ -934,31 +934,31 @@ LDADD = ./libpISSM.a $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) libOverload.a -diagnostic_exe_SOURCES = parallel/diagnostic.cpp +diagnostic_exe_SOURCES = solutions/diagnostic.cpp diagnostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -steadystate_exe_SOURCES = parallel/steadystate.cpp +steadystate_exe_SOURCES = solutions/steadystate.cpp steadystate_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -thermal_exe_SOURCES = parallel/thermal.cpp +thermal_exe_SOURCES = solutions/thermal.cpp thermal_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -prognostic_exe_SOURCES = parallel/prognostic.cpp +prognostic_exe_SOURCES = solutions/prognostic.cpp prognostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -prognostic2_exe_SOURCES = parallel/prognostic2.cpp +prognostic2_exe_SOURCES = solutions/prognostic2.cpp prognostic2_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -balancedthickness_exe_SOURCES = parallel/balancedthickness.cpp +balancedthickness_exe_SOURCES = solutions/balancedthickness.cpp balancedthickness_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -balancedthickness2_exe_SOURCES = parallel/balancedthickness2.cpp +balancedthickness2_exe_SOURCES = solutions/balancedthickness2.cpp balancedthickness2_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -balancedvelocities_exe_SOURCES = parallel/balancedvelocities.cpp +balancedvelocities_exe_SOURCES = solutions/balancedvelocities.cpp balancedvelocities_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -slopecompute_exe_SOURCES = parallel/slopecompute.cpp +slopecompute_exe_SOURCES = solutions/slopecompute.cpp slopecompute_exe_CXXFLAGS= -fPIC -D_PARALLEL_ -transient_exe_SOURCES = parallel/transient.cpp +transient_exe_SOURCES = solutions/transient.cpp transient_exe_CXXFLAGS= -fPIC -D_PARALLEL_ Index: /issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp =================================================================== --- /issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp (revision 3894) +++ /issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp (revision 3895) @@ -32,5 +32,5 @@ #include "./Qmux.h" #include "../include/include.h" -#include "../parallel/parallel.h" +#include "../solutions/solutions.h" void SpawnCoreParallel(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, Model* model,int analysis_type,int sub_analysis_type,int counter){ Index: /issm/trunk/src/c/solutions/ControlInitialization.cpp =================================================================== --- /issm/trunk/src/c/solutions/ControlInitialization.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/ControlInitialization.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/ControlRestart.cpp =================================================================== --- /issm/trunk/src/c/solutions/ControlRestart.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/ControlRestart.cpp (revision 3895) @@ -4,5 +4,5 @@ */ -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/solutions/balancedthickness.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedthickness.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/balancedthickness.cpp (revision 3895) @@ -14,5 +14,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/balancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedthickness2.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/balancedthickness2.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/balancedthickness2_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedthickness2_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/balancedthickness2_core.cpp (revision 3895) @@ -8,5 +8,5 @@ #include "../include/include.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/balancedthickness_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedthickness_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/balancedthickness_core.cpp (revision 3895) @@ -8,5 +8,5 @@ #include "../include/include.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/balancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedvelocities.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/balancedvelocities.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/balancedvelocities_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancedvelocities_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/balancedvelocities_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/control_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/control_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/control_core.cpp (revision 3895) @@ -3,5 +3,5 @@ */ -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/solutions/diagnostic.cpp =================================================================== --- /issm/trunk/src/c/solutions/diagnostic.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/diagnostic.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/diagnostic_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/diagnostic_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/diagnostic_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" #include "../include/include.h" Index: /issm/trunk/src/c/solutions/diagnostic_core_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/solutions/diagnostic_core_nonlinear.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/diagnostic_core_nonlinear.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../EnumDefinitions/EnumDefinitions.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" void diagnostic_core_nonlinear(Vec* pug,Mat* pKff0,Mat* pKfs0, DataSet* input_loads,FemModel* fem,int analysis_type,int sub_analysis_type){ Index: /issm/trunk/src/c/solutions/gradjcompute_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/gradjcompute_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/gradjcompute_core.cpp (revision 3895) @@ -4,5 +4,5 @@ #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: /issm/trunk/src/c/solutions/objectivefunctionC.cpp =================================================================== --- /issm/trunk/src/c/solutions/objectivefunctionC.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/objectivefunctionC.cpp (revision 3895) @@ -4,5 +4,5 @@ #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" #include "../EnumDefinitions/EnumDefinitions.h" Index: sm/trunk/src/c/solutions/parallel.h =================================================================== --- /issm/trunk/src/c/solutions/parallel.h (revision 3894) +++ (revision ) @@ -1,63 +1,0 @@ -/* - * parallel.h: - */ - -#ifndef PARALLEL_H_ -#define PARALLEL_H_ - -#include "../objects/objects.h" -#include "../io/io.h" - -struct OptArgs; -class FemModel; - -/*cores: */ -DataSet* gradjcompute_core(Model* model); -DataSet* diagnostic_core(Model* model); -DataSet* prognostic_core(Model* model); -DataSet* prognostic2_core(Model* model); -DataSet* balancedthickness_core(Model* model); -DataSet* balancedthickness2_core(Model* model); -DataSet* balancedvelocities_core(Model* model); -DataSet* slopecompute_core(Model* model); -DataSet* control_core(Model* model); -DataSet* steadystate_core(Model* model); -DataSet* transient_core(Model* model); -DataSet* transient_core_2d(Model* model); -DataSet* transient_core_3d(Model* model); -DataSet* thermal_core(Model* model); - -/*computational cores: */ -void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,int analysis_type,int sub_analysis_type); -void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* loads, FemModel* fem,int analysis_type,int sub_analysis_type); -void diagnostic_core_linear(Vec* ppg,FemModel* fem,int analysis_type,int sub_analysis_type); -void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem,int AnalysisEnum); - - - - - -//int GradJOrth(WorkspaceParams* workspaceparams); -void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters); - -int GoldenSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femmodel); - -int BrentSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femmodel); - -double objectivefunctionC(double search_scalar,OptArgs* optargs); - -int GradJSearch(double* search_vector,FemModel* femmodel,int step); -//int GradJCheck(WorkspaceParams* workspaceparams,int step,int status); - -//int ParameterUpdate(double* search_vector,int step, WorkspaceParams* workspaceparams,BatchParams* batchparams); -void OutputResults(DataSet* results,char* filename); -void WriteLockFile(char* filename); - -void ControlInitialization(Model* model); -void ControlRestart(Model* model,double* param_g); - -void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type); -//int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femmodel,char* filename); -void ProcessResults(DataSet** pnewresults, DataSet* results,Model* model,int analysis_type); - -#endif Index: /issm/trunk/src/c/solutions/prognostic.cpp =================================================================== --- /issm/trunk/src/c/solutions/prognostic.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/prognostic.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/prognostic2.cpp =================================================================== --- /issm/trunk/src/c/solutions/prognostic2.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/prognostic2.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/prognostic2_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/prognostic2_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/prognostic2_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/prognostic_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/prognostic_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/prognostic_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/slope_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/slope_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/slope_core.cpp (revision 3895) @@ -3,5 +3,5 @@ */ -#include "./parallel.h" +#include "./solutions.h" #include "../toolkits/toolkits.h" #include "../objects/objects.h" Index: /issm/trunk/src/c/solutions/slopecompute.cpp =================================================================== --- /issm/trunk/src/c/solutions/slopecompute.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/slopecompute.cpp (revision 3895) @@ -14,5 +14,5 @@ #include "../EnumDefinitions/EnumDefinitions.h" #include "../include/include.h" -#include "./parallel.h" +#include "./solutions.h" Index: /issm/trunk/src/c/solutions/slopecompute_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/slopecompute_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/slopecompute_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/solutions.h =================================================================== --- /issm/trunk/src/c/solutions/solutions.h (revision 3895) +++ /issm/trunk/src/c/solutions/solutions.h (revision 3895) @@ -0,0 +1,63 @@ +/* + * solutions.h: + */ + +#ifndef PARALLEL_H_ +#define PARALLEL_H_ + +#include "../objects/objects.h" +#include "../io/io.h" + +struct OptArgs; +class FemModel; + +/*cores: */ +DataSet* gradjcompute_core(Model* model); +DataSet* diagnostic_core(Model* model); +DataSet* prognostic_core(Model* model); +DataSet* prognostic2_core(Model* model); +DataSet* balancedthickness_core(Model* model); +DataSet* balancedthickness2_core(Model* model); +DataSet* balancedvelocities_core(Model* model); +DataSet* slopecompute_core(Model* model); +DataSet* control_core(Model* model); +DataSet* steadystate_core(Model* model); +DataSet* transient_core(Model* model); +DataSet* transient_core_2d(Model* model); +DataSet* transient_core_3d(Model* model); +DataSet* thermal_core(Model* model); + +/*computational cores: */ +void thermal_core_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* fem,int analysis_type,int sub_analysis_type); +void diagnostic_core_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, DataSet* loads, FemModel* fem,int analysis_type,int sub_analysis_type); +void diagnostic_core_linear(Vec* ppg,FemModel* fem,int analysis_type,int sub_analysis_type); +void slope_core(Vec* pslopex,Vec* pslopey,FemModel* fem,int AnalysisEnum); + + + + + +//int GradJOrth(WorkspaceParams* workspaceparams); +void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters); + +int GoldenSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femmodel); + +int BrentSearch(double* psearch_scalar,double* pJ,double xa, double xb, double tolerance, int maxiter, double fit,double optscal,double (*f)(double*,double,double,FemModel*),FemModel* femmodel); + +double objectivefunctionC(double search_scalar,OptArgs* optargs); + +int GradJSearch(double* search_vector,FemModel* femmodel,int step); +//int GradJCheck(WorkspaceParams* workspaceparams,int step,int status); + +//int ParameterUpdate(double* search_vector,int step, WorkspaceParams* workspaceparams,BatchParams* batchparams); +void OutputResults(DataSet* results,char* filename); +void WriteLockFile(char* filename); + +void ControlInitialization(Model* model); +void ControlRestart(Model* model,double* param_g); + +void CreateFemModel(FemModel* femmodel,ConstDataHandle MODEL,int analysis_type,int sub_analysis_type); +//int BatchDebug(Mat* Kgg,Vec* pg,FemModel* femmodel,char* filename); +void ProcessResults(DataSet** pnewresults, DataSet* results,Model* model,int analysis_type); + +#endif Index: /issm/trunk/src/c/solutions/steadystate.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystate.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/steadystate.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystate_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/steadystate_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/thermal.cpp =================================================================== --- /issm/trunk/src/c/solutions/thermal.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/thermal.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/thermal_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/thermal_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/thermal_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/transient.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/transient.cpp (revision 3895) @@ -15,5 +15,5 @@ #include "../include/include.h" #include "../modules.h" -#include "./parallel.h" +#include "./solutions.h" int main(int argc,char* *argv){ Index: /issm/trunk/src/c/solutions/transient_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient_core.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/transient_core.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/transient_core_2d.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient_core_2d.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/transient_core_2d.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h" Index: /issm/trunk/src/c/solutions/transient_core_3d.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient_core_3d.cpp (revision 3894) +++ /issm/trunk/src/c/solutions/transient_core_3d.cpp (revision 3895) @@ -7,5 +7,5 @@ #include "../shared/shared.h" #include "../EnumDefinitions/EnumDefinitions.h" -#include "./parallel.h" +#include "./solutions.h" #include "../modules.h"