Context Navigation

← Previous Changeset
Next Changeset →

Changeset 3895

Timestamp:

05/21/10 17:08:26 (15 years ago)

Author:

Eric.Larour

Message:

Moved parallel to solutions

Location:

issm/trunk/src/c

Files:

: 31 edited
: 1 moved

Makefile.am (modified) (2 diffs)
Qmux/SpawnCoreParallel.cpp (modified) (1 diff)
solutions/ControlInitialization.cpp (modified) (1 diff)
solutions/ControlRestart.cpp (modified) (1 diff)
solutions/balancedthickness.cpp (modified) (1 diff)
solutions/balancedthickness2.cpp (modified) (1 diff)
solutions/balancedthickness2_core.cpp (modified) (1 diff)
solutions/balancedthickness_core.cpp (modified) (1 diff)
solutions/balancedvelocities.cpp (modified) (1 diff)
solutions/balancedvelocities_core.cpp (modified) (1 diff)
solutions/control_core.cpp (modified) (1 diff)
solutions/diagnostic.cpp (modified) (1 diff)
solutions/diagnostic_core.cpp (modified) (1 diff)
solutions/diagnostic_core_nonlinear.cpp (modified) (1 diff)
solutions/gradjcompute_core.cpp (modified) (1 diff)
solutions/objectivefunctionC.cpp (modified) (1 diff)
solutions/prognostic.cpp (modified) (1 diff)
solutions/prognostic2.cpp (modified) (1 diff)
solutions/prognostic2_core.cpp (modified) (1 diff)
solutions/prognostic_core.cpp (modified) (1 diff)
solutions/slope_core.cpp (modified) (1 diff)
solutions/slopecompute.cpp (modified) (1 diff)
solutions/slopecompute_core.cpp (modified) (1 diff)
solutions/solutions.h (moved) (moved from issm/trunk/src/c/solutions/parallel.h ) (1 diff)
solutions/steadystate.cpp (modified) (1 diff)
solutions/steadystate_core.cpp (modified) (1 diff)
solutions/thermal.cpp (modified) (1 diff)
solutions/thermal_core.cpp (modified) (1 diff)
solutions/transient.cpp (modified) (1 diff)
solutions/transient_core.cpp (modified) (1 diff)
solutions/transient_core_2d.cpp (modified) (1 diff)
solutions/transient_core_3d.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

issm/trunk/src/c/Makefile.am

-              r3845
+              r3895
                                         ./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\
 …
 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_

issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp

r3887	r3895
32	32	#include "./Qmux.h"
33	33	#include "../include/include.h"
34		#include "../~~parallel/parallel~~.h"
	34	#include "../solutions/solutions.h"
35	35
36	36	void SpawnCoreParallel(double* responses, int numresponses, double* variables, char** variables_descriptors,int numvariables, Model* model,int analysis_type,int sub_analysis_type,int counter){

issm/trunk/src/c/solutions/ControlInitialization.cpp

r3775	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/ControlRestart.cpp

r3887	r3895
4	4	*/
5	5
6		#include "./~~parallel~~.h"
	6	#include "./solutions.h"
7	7	#include "../modules.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/solutions/balancedthickness.cpp

r3887	r3895
14	14	#include "../include/include.h"
15	15	#include "../modules.h"
16		#include "./~~parallel~~.h"
	16	#include "./solutions.h"
17	17
18	18	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/balancedthickness2.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/balancedthickness2_core.cpp

r3887	r3895
8	8	#include "../include/include.h"
9	9	#include "../EnumDefinitions/EnumDefinitions.h"
10		#include "./~~parallel~~.h"
	10	#include "./solutions.h"
11	11	#include "../modules.h"
12	12

issm/trunk/src/c/solutions/balancedthickness_core.cpp

r3887	r3895
8	8	#include "../include/include.h"
9	9	#include "../EnumDefinitions/EnumDefinitions.h"
10		#include "./~~parallel~~.h"
	10	#include "./solutions.h"
11	11	#include "../modules.h"
12	12

issm/trunk/src/c/solutions/balancedvelocities.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/balancedvelocities_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/control_core.cpp

r3887	r3895
3	3	*/
4	4
5		#include "./~~parallel~~.h"
	5	#include "./solutions.h"
6	6	#include "../modules.h"
7	7	#include "../EnumDefinitions/EnumDefinitions.h"

issm/trunk/src/c/solutions/diagnostic.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/diagnostic_core.cpp

r3894	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11	#include "../include/include.h"

issm/trunk/src/c/solutions/diagnostic_core_nonlinear.cpp

r3879	r3895
7	7	#include "../EnumDefinitions/EnumDefinitions.h"
8	8	#include "../modules.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10
11	11	void diagnostic_core_nonlinear(Vec* pug,Mat* pKff0,Mat* pKfs0, DataSet* input_loads,FemModel* fem,int analysis_type,int sub_analysis_type){

issm/trunk/src/c/solutions/gradjcompute_core.cpp

r3887	r3895
4	4
5	5	#include "../modules.h"
6		#include "./~~parallel~~.h"
	6	#include "./solutions.h"
7	7	#include "../EnumDefinitions/EnumDefinitions.h"
8	8

issm/trunk/src/c/solutions/objectivefunctionC.cpp

r3887	r3895
4	4
5	5	#include "../modules.h"
6		#include "./~~parallel~~.h"
	6	#include "./solutions.h"
7	7	#include "../EnumDefinitions/EnumDefinitions.h"
8	8

issm/trunk/src/c/solutions/prognostic.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/prognostic2.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/prognostic2_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/prognostic_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/slope_core.cpp

r3778	r3895
3	3	*/
4	4
5		#include "./~~parallel~~.h"
	5	#include "./solutions.h"
6	6	#include "../toolkits/toolkits.h"
7	7	#include "../objects/objects.h"

issm/trunk/src/c/solutions/slopecompute.cpp

r3887	r3895
14	14	#include "../EnumDefinitions/EnumDefinitions.h"
15	15	#include "../include/include.h"
16		#include "./~~parallel~~.h"
	16	#include "./solutions.h"
17	17
18	18

issm/trunk/src/c/solutions/slopecompute_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/solutions.h

r3894	r3895
1	1	/*
2		* ~~parallel~~.h:
	2	* solutions.h:
3	3	*/
4	4

issm/trunk/src/c/solutions/steadystate.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/steadystate_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/thermal.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/thermal_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/transient.cpp

r3887	r3895
15	15	#include "../include/include.h"
16	16	#include "../modules.h"
17		#include "./~~parallel~~.h"
	17	#include "./solutions.h"
18	18
19	19	int main(int argc,char* *argv){

issm/trunk/src/c/solutions/transient_core.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/transient_core_2d.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

issm/trunk/src/c/solutions/transient_core_3d.cpp

r3887	r3895
7	7	#include "../shared/shared.h"
8	8	#include "../EnumDefinitions/EnumDefinitions.h"
9		#include "./~~parallel~~.h"
	9	#include "./solutions.h"
10	10	#include "../modules.h"
11	11

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 3895

Legend:

Download in other formats: