Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/c/Makefile.am

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/c/Makefile.am (modified) (12 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/c/Makefile.am

@@ -1 @@
-AM_CPPFLAGS = @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
+AM_CPPFLAGS = @NEOPZINCL@ @DAKOTAINCL@ @SHAPELIBINCL@ @PETSCINCL@ @SLEPCINCL@ @AMPIINCL@ @MPIINCL@ @METISINCL@ @CHACOINCL@ @SCOTCHINCL@ @PLAPACKINCL@ @BLASLAPACKINCL@ @MKLINCL@ @MUMPSINCL@ @TRIANGLEINCL@ @SPAIINCL@ @HYPREINCL@ @PROMETHEUSINCL@ @SUPERLUINCL@ @SPOOLESINCL@ @PASTIXINCL@ @MLINCL@ @TAOINCL@ @ADIC2INCL@ @ADOLCINCL@ @GSLINCL@ @BOOSTINCL@ @ANDROID_NDKINCL@ @METEOIOINCL@ @SNOWPACKINCL@ @PROJ4INCL@
 
 AUTOMAKE_OPTIONS = subdir-objects
@@ -20 +20 @@
 
 #Core sources
+#BAMG sources  {{{
+issm_sources = 
+if BAMG
+issm_sources += ./bamg/BamgGeom.cpp\
+                                         ./bamg/BamgMesh.cpp\
+                                         ./bamg/BamgOpts.cpp\
+                                         ./bamg/CrackedEdge.cpp\
+                                         ./bamg/Curve.cpp\
+                                         ./bamg/Edge.cpp\
+                                         ./bamg/GeomEdge.cpp\
+                                         ./bamg/GeomSubDomain.cpp\
+                                         ./bamg/GeomVertex.cpp\
+                                         ./bamg/Geometry.cpp\
+                                         ./bamg/ListofIntersectionTriangles.cpp\
+                                         ./bamg/EigenMetric.cpp\
+                                         ./bamg/Metric.cpp\
+                                         ./bamg/BamgQuadtree.cpp\
+                                         ./bamg/SetOfE4.cpp\
+                                         ./bamg/SubDomain.cpp\
+                                         ./bamg/AdjacentTriangle.cpp\
+                                         ./bamg/Triangle.cpp\
+                                         ./bamg/BamgVertex.cpp\
+                                         ./bamg/VertexOnEdge.cpp\
+                                         ./bamg/VertexOnGeom.cpp\
+                                         ./bamg/VertexOnVertex.cpp\
+                                         ./bamg/Mesh.cpp\
+                                         ./shared/Bamg/BigPrimeNumber.cpp\
+                                         ./modules/Bamgx/Bamgx.cpp\
+                                         ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
+                                         ./modules/BamgTriangulatex/BamgTriangulatex.cpp
+endif
+#}}}
 #Core sources{{{
-issm_sources = ./datastructures/DataSet.cpp\
+issm_sources += ./datastructures/DataSet.cpp\
                                         ./classes/gauss/GaussSeg.cpp\
                                         ./classes/gauss/GaussTria.cpp\
@@ -265 +297 @@
                                         ./modules/ModelProcessorx/CreateOutputDefinitions.cpp\
                                         ./modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp\
+                                        ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
                                         ./classes/Inputs/PentaInput.cpp\
                                         ./classes/Inputs/TetraInput.cpp
@@ -279 +312 @@
                                           ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp\
                                           ./cores/dakota_core.cpp
-endif
-#}}}
-#BAMG sources  {{{
-if BAMG
-issm_sources += ./bamg/BamgGeom.cpp\
-                                         ./bamg/BamgMesh.cpp\
-                                         ./bamg/BamgOpts.cpp\
-                                         ./bamg/CrackedEdge.cpp\
-                                         ./bamg/Curve.cpp\
-                                         ./bamg/Direction.cpp\
-                                         ./bamg/Edge.cpp\
-                                         ./bamg/GeomEdge.cpp\
-                                         ./bamg/GeomSubDomain.cpp\
-                                         ./bamg/GeomVertex.cpp\
-                                         ./bamg/Geometry.cpp\
-                                         ./bamg/ListofIntersectionTriangles.cpp\
-                                         ./bamg/EigenMetric.cpp\
-                                         ./bamg/Metric.cpp\
-                                         ./bamg/BamgQuadtree.cpp\
-                                         ./bamg/SetOfE4.cpp\
-                                         ./bamg/SubDomain.cpp\
-                                         ./bamg/AdjacentTriangle.cpp\
-                                         ./bamg/Triangle.cpp\
-                                         ./bamg/BamgVertex.cpp\
-                                         ./bamg/VertexOnEdge.cpp\
-                                         ./bamg/VertexOnGeom.cpp\
-                                         ./bamg/VertexOnVertex.cpp\
-                                         ./bamg/Mesh.cpp\
-                                         ./shared/Bamg/BigPrimeNumber.cpp\
-                                         ./modules/Bamgx/Bamgx.cpp\
-                                         ./modules/BamgConvertMeshx/BamgConvertMeshx.cpp\
-                                         ./modules/BamgTriangulatex/BamgTriangulatex.cpp
 endif
 #}}}
@@ -453 +454 @@
 #}}}
 #Gia sources  {{{
-if GIA
+if GIAIVINS
 issm_sources +=  ./cores/gia_core.cpp\
-                                        ./analyses/GiaAnalysis.cpp\
+                                        ./analyses/GiaIvinsAnalysis.cpp\
                                         ./modules/GiaDeflectionCorex/GiaDeflectionCorex.cpp\
                                         ./modules/GiaDeflectionCorex/distme.f\
@@ -464 +465 @@
                                         ./modules/GiaDeflectionCorex/stot.f\
                                         ./modules/GiaDeflectionCorex/what0.f
+endif
+#}}}
+#Esa sources  {{{
+if ESA 
+issm_sources +=  ./cores/esa_core.cpp\
+                                        ./analyses/EsaAnalysis.cpp
 endif
 #}}}
@@ -524 +531 @@
                                   ./kml/KMLFileReadUtils.cpp
 #}}}
+#NEOPZ sources  {{{
+neopz_sources = ./classes/AdaptiveMeshRefinement.cpp
+#}}}
 #Modules sources{{{
 modules_sources= ./shared/Threads/LaunchThread.cpp\
@@ -540 +550 @@
                         ./modules/InterpFromMesh2dx/InterpFromMesh2dx.cpp\
                         ./modules/InterpFromMesh2dx/InterpFromMesh2dxt.cpp\
-                        ./modules/InterpFromMeshToMesh2dx/InterpFromMeshToMesh2dx.cpp\
                         ./modules/InterpFromMeshToMesh3dx/InterpFromMeshToMesh3dx.cpp\
                         ./modules/InterpFromMeshToGridx/InterpFromMeshToGridx.cpp\
@@ -598 +607 @@
 endif
 
+if NEOPZ
+libISSMCore_la_SOURCES += $(neopz_sources)
+endif
+
 if WRAPPERS
 libISSMModules_la_SOURCES = $(modules_sources)
@@ -607 +620 @@
 libISSMModules_la_SOURCES += $(kml_sources)
 endif
+
 libISSMModules_la_CXXFLAGS = $(ALLCXXFLAGS)
 if !WINDOWS
@@ -668 +682 @@
 
 #External packages
-LDADD +=  $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(PETSCLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB)  $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJ4LIB)
+LDADD +=  $(NEOPZLIB) $(TAOLIB) $(M1QN3LIB) $(PLAPACKLIB) $(MUMPSLIB) $(SUPERLULIB) $(SPOOLESLIB) $(SCALAPACKLIB) $(BLACSLIB) $(PETSCLIB) $(HYPRELIB) $(SPAILIB) $(PROMETHEUSLIB) $(PASTIXLIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB)  $(MATHLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(OSLIBS) $(GSLLIB) $(AMPILIB) $(ADOLCLIB) $(MPILIB) $(METEOIOLIB) $(SNOWPACKLIB) $(PROJ4LIB)
 
 if FORTRAN
@@ -680 +694 @@
 issm_slr_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
 
+if OCEAN
+bin_PROGRAMS += issm_ocean
+issm_ocean_SOURCES = main/issm_ocean.cpp
+issm_ocean_CXXFLAGS= $(CXXFLAGS) $(CXXOPTFLAGS)
+endif
 
 if KRIGING