Merge branch 'feflow'

rserrano · Sep 17, 2018 · 3f4aca8 · 3f4aca8
2 parents 57fe7e0 + 295fa10
commit 3f4aca8
Show file tree

Hide file tree

Showing 22 changed files with 752 additions and 4,356 deletions.
diff --git a/geomodelr/__init__.py b/geomodelr/__init__.py
@@ -19,10 +19,6 @@
 import model
 import shared
 import cpp
-import utils
-import isosurfaces
-import modflow
-import feflow
 import __main__
 from model import model_from_file
 from cpp import set_verbose

diff --git a/geomodelr/cpp/Makefile b/geomodelr/cpp/Makefile
@@ -2,8 +2,8 @@
 cpp: cpp.so
 	cp cpp.so ..
 
-cpp.so: basic.o section.o match.o model.o geomodel.o faults.o speed_up.o polygon.o isosurfaces_vdb.o
-	g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security  basic.o section.o match.o model.o geomodel.o faults.o speed_up.o polygon.o isosurfaces_vdb.o -L/usr/local/lib -L/usr/lib/x86_64-linux-gnu/ -lboost_python -lopenvdb -o cpp.so
+cpp.so: basic.o section.o match.o model.o geomodel.o faults.o polygon.o
+	g++ -pthread -shared -Wl,-O1 -Wl,-Bsymbolic-functions -Wl,-Bsymbolic-functions -Wl,-z,relro -fno-strict-aliasing -DNDEBUG -g -fwrapv -O2 -Wall -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -Wl,-Bsymbolic-functions -Wl,-z,relro -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security  basic.o section.o match.o model.o geomodel.o faults.o polygon.o -L/usr/local/lib -L/usr/lib/x86_64-linux-gnu/ -lboost_python -o cpp.so
 
 polygon.o: polygon.cpp polygon.hpp
 	g++ -pthread -DNDEBUG -g -fwrapv -O2 -Wall -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/local/include -I/usr/include/python2.7 -c polygon.cpp -std=c++11
@@ -19,7 +19,8 @@ geomodel.o: geomodel.cpp geomodel.hpp
 	g++ -pthread -DNDEBUG -g -fwrapv -O2 -Wall -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/local/include -I/usr/include/python2.7 -c geomodel.cpp -std=c++11
 faults.o: faults.cpp faults.hpp
 	g++ -pthread -DNDEBUG -g -fwrapv -O2 -Wall -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/local/include -I/usr/include/python2.7 -c faults.cpp -std=c++11
-speed_up.o: speed_up.cpp speed_up.hpp
-	g++ -pthread -DNDEBUG -g -fwrapv -O2 -Wall -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/local/include -I/usr/include/python2.7 -c speed_up.cpp -std=c++11
-isosurfaces_vdb.o: isosurfaces_vdb.cpp isosurfaces_vdb.hpp
-	g++ -pthread -DNDEBUG -g -fwrapv -O2 -Wall -fno-strict-aliasing -Wdate-time -D_FORTIFY_SOURCE=2 -g -fstack-protector-strong -Wformat -Werror=format-security -fPIC -I/usr/local/include -I/usr/include/python2.7 -c isosurfaces_vdb.cpp -std=c++11
+
+clean:
+	rm *.o
+	rm cpp.so
+	rm ../cpp.so