hpp headers and makefile edits

parmes · Jul 31, 2019 · 6e7df49 · 6e7df49
1 parent 090cc25
commit 6e7df49
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 15 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,10 @@
 include Config.mak
 
 # C includes
-C_INC=inc/err.h inc/alg.h inc/real.h
+C_INC=inc/err.h inc/alg.h inc/real.h cpp/version.h
 
 # C++ files
-CPP_INC=cpp/solfec.h cpp/version.h
+CPP_INC=cpp/solfec.hpp inc/fmt.hpp
 CPP_SRC=cpp/tasksys.cpp cpp/solfec.cpp cpp/input.cpp cpp/spline.cpp
 
 # ISPC files

diff --git a/common.mk b/common.mk
@@ -62,9 +62,10 @@ dirs:
 del:
 	find ./ -iname "*.dump" -exec rm '{}' ';'
 
-clean:
+clean: del
 	/bin/rm -rf objs* *~ $(EXE)4 $(EXE)8 *.dSYM
-	find ./ -iname "*.dump" -exec rm '{}' ';'
+
+cleanall: clean
 	cd lib/metis && make clean
 
 version:

diff --git a/cpp/input.cpp b/cpp/input.cpp
@@ -33,8 +33,8 @@ SOFTWARE.
 #include "real.h"
 #include "err.h"
 #include "alg.h"
-#include "fmt.h"
-#include "solfec.h"
+#include "fmt.hpp"
+#include "solfec.hpp"
 #include "util_ispc.h"
 
 #if PY_MAJOR_VERSION >= 3

diff --git a/cpp/solfec.cpp b/cpp/solfec.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <mpi.h>
 #include "real.h"
 #include "version.h"
-#include "solfec.h"
+#include "solfec.hpp"
 
 /* solfec global variables */
 namespace solfec

diff --git a/cpp/solfec.h → cpp/solfec.hpp b/cpp/solfec.h → cpp/solfec.hpp
diff --git a/cpp/spline.cpp b/cpp/spline.cpp
@@ -29,7 +29,7 @@ SOFTWARE.
 #include <float.h>
 #include "real.h"
 #include "err.h"
-#include "solfec.h"
+#include "solfec.hpp"
 
 static size_t findmarker (std::vector<std::array<REAL,2>>::iterator begin, std::vector<std::array<REAL,2>>::iterator end, REAL xval)
 {

diff --git a/cpp/version.h b/cpp/version.h
@@ -1,2 +1,2 @@
-#define VERSION_HASH "9046ed1"
-#define VERSION_DATE "2019-07-30"
+#define VERSION_HASH "090cc25"
+#define VERSION_DATE "2019-07-31"
diff --git a/doc/solfec-2.0-design-manual.lyx b/doc/solfec-2.0-design-manual.lyx
@@ -133,7 +133,7 @@ Nodes and DOFs, partitioned (driven by partitioning elements) and stored
 
 \begin_layout Itemize
 Elements, partitioned by their connectivity and weight of assembly (serial
- METIS on rank 0 process); Element types: hex, wed, pyr, tet, ellip
+ METIS on rank 0 process); Element types: hex, wed, pyr, tet
 \end_layout
 
 \begin_layout Itemize
@@ -150,9 +150,13 @@ Only MPI rank 0 process is processing the input file; the other processes
 \end_layout
 
 \begin_layout Itemize
-Optional repartitioning and recreation of node and element structures, depending
- on the degree of imbalance due to insertions and deletions of bodies, occurs
- prior to RUN()s
+Optional re-partitioning and recreation of node and element structures,
+ depending on the degree of imbalance due to insertions and deletions of
+ bodies, occurs prior to RUN()s
+\end_layout
+
+\begin_layout Itemize
+Independent partitioning and re-partitioning of ELLIPs.
 \end_layout
 
 \begin_layout Itemize
@@ -213,7 +217,19 @@ Data structures
 \end_layout
 
 \begin_layout Section
-Finite element assembly
+Partitioning and re-partitioning of finite elements
+\end_layout
+
+\begin_layout Section
+Partitioning and re-partitioning of ellipsoids
+\end_layout
+
+\begin_layout Section
+Finite elements assembly
+\end_layout
+
+\begin_layout Section
+Ellipsoids assembly
 \end_layout
 
 \begin_layout Section

diff --git a/inc/fmt.h → inc/fmt.hpp b/inc/fmt.h → inc/fmt.hpp