Changeset 12377 for issm/trunk-jpl/src/c/Makefile.am

Timestamp:

06/07/12 08:01:49 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added parallel kriging module

File:

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

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

@@ -633 +633 @@
                                                 ./modules/Krigingx/Krigingx.h
 
+#For parallel kriging, only difference is ./modules/Krigingx/pKrigingx.cpp with no multithreading
+pkriging_sources = ./Container/Observations.h\
+                                                ./Container/Observations.cpp\
+                                                ./objects/Kriging/Variogram.h \
+                                                ./objects/Kriging/GaussianVariogram.h\
+                                                ./objects/Kriging/GaussianVariogram.cpp\
+                                                ./objects/Kriging/ExponentialVariogram.h\
+                                                ./objects/Kriging/ExponentialVariogram.cpp\
+                                                ./objects/Kriging/SphericalVariogram.h\
+                                                ./objects/Kriging/SphericalVariogram.cpp\
+                                                ./objects/Kriging/PowerVariogram.h\
+                                                ./objects/Kriging/PowerVariogram.cpp\
+                                                ./objects/Kriging/Quadtree.h\
+                                                ./objects/Kriging/Quadtree.cpp\
+                                                ./objects/Kriging/Observation.h\
+                                                ./objects/Kriging/Observation.cpp\
+                                                ./modules/Krigingx/pKrigingx.cpp\
+                                                ./modules/Krigingx/Krigingx.h
+
 #}}}
 #Kml sources  {{{1
@@ -964 +983 @@
 
 libISSMCore_a_SOURCES  = $(issm_sources)
+libISSMCore_a_SOURCES += $(pkriging_sources)
 libISSMCore_a_CXXFLAGS = $(ALLCXXFLAGS)
 
@@ -1005 +1025 @@
 issm_SOURCES = solutions/issm.cpp
 issm_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
+
+bin_PROGRAMS += kriging
+kriging_SOURCES = solutions/kriging.cpp
+kriging_CXXFLAGS= -fPIC $(CXXFLAGS) $(CXXOPTFLAGS) $(COPTFLAGS) 
 #}}}
 #Automatic differentiation: append this fold to the end of the src/c/Makefile.am to get this Makefile.am {{{