Changeset 11735

Timestamp:

03/19/12 20:12:04 (13 years ago)

Author:

Eric.Larour

Message:

Adding gsl support, issm toolkit.

File:

• issm/trunk-jpl/src/c/Makefile.am (modified) (7 diffs)

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

@@ -1 @@
-INCLUDES = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@
+INCLUDES = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @MPIINCL@ @MATLABINCL@  @METISINCL@  @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@  @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@  @TRIANGLEINCL@ @HYPREINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@
 EXEEXT=$(ISSMEXT)
 
@@ -214 +214 @@
                                         ./toolkits/mpi/patches/MPI_Boundariesfromrange.cpp\
                                         ./toolkits/metis/metisincludes.h\
+                                        ./toolkits/issm/issmtoolkit.h\
+                                        ./toolkits/issm/SeqVec.h\
+                                        ./toolkits/issm/SeqVec.cpp\
+                                        ./toolkits/issm/SeqMat.h\
+                                        ./toolkits/issm/SeqMat.cpp\
                                         ./toolkits/metis/patches/metispatches.h\
                                         ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp\
@@ -237 +242 @@
                                         ./modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp\
                                         ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp\
+                                        ./modules/ParsePetscOptionsx/ParsePetscOptionsx.h\
+                                        ./modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp\
                                         ./modules/NodesDofx/NodesDofx.h\
                                         ./modules/NodesDofx/NodesDofx.cpp\
@@ -694 +701 @@
                                     ./toolkits/matlab/matlabincludes.h\
                                     ./toolkits/matlab/MatlabNArrayToNArray.cpp\
-                                    ./toolkits/matlab/MatlabMatrixToMatrix.cpp\
-                                    ./toolkits/matlab/MatlabVectorToVector.cpp\
                                     ./toolkits/double/MatlabVectorToDoubleVector.cpp\
                                     ./toolkits/double/double.h\
@@ -736 +741 @@
                                         ./toolkits/petsc/petscincludes.h\
                                         ./shared/Numerics/PetscOptionsFromAnalysis.cpp\
-                                        ./modules/ParsePetscOptionsx/ParsePetscOptionsx.h\
-                                        ./modules/ParsePetscOptionsx/ParsePetscOptionsx.cpp\
                                         ./modules/Solverx/SolverxPetsc.cpp\
                                         ./modules/Solverx/DofTypesToIndexSet.cpp
+
+#}}}
+#Gsl sources  {{{1
+gsl_sources= ./modules/Solverx/SolverxGsl.cpp
 
 #}}}
@@ -846 +853 @@
 endif
 
+if GSL
+issm_sources  +=  $(gsl_sources)
+issm_psources +=  $(gsl_psources)
+endif
+
+
 if TRANSIENT
 issm_sources  +=  $(transient_sources)
@@ -947 +960 @@
 
 #External packages
-LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS)
+LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB)
 
 issm_SOURCES = solutions/issm.cpp