Merge branch 'develop'

merging with develop before release
bbercovici · Nov 22, 2018 · dea832f · dea832f
2 parents b6164be + a99cd9e
commit dea832f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -45,9 +45,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/source/cmake)
 
 # Compiler flags
 add_definitions(-Wall -O2 )
-
-# Enable C++17 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(CMAKE_CXX_STANDARD 11)
 
 # Include directories
 include_directories(include)

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
@@ -46,7 +46,6 @@ endif()
 
 cmake_minimum_required(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.0)
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/source/cmake)
-set(CMAKE_CXX_FLAGS "-std=c++14")
 
 add_definitions(-Wall -O2 )
 include_directories(include)

diff --git a/source/SHARMLib.cpp b/source/SHARMLib.cpp
@@ -35,6 +35,8 @@ namespace SHARMLib {
 		double * r2,                   
 		bool normalized) {
 
+
+
 	/* result accumulators */
 		double Cnm [NM_DIM_MAX + 1] [NM_DIM_MAX + 1], Snm [NM_DIM_MAX + 1] [NM_DIM_MAX + 1];
 	double	mixingFactors [NM_DIM_MAX + 1] [NM_DIM_MAX + 1] [NM_DIM_MAX + 1]; /* (i!) (j!) (k!) / (n+3)! */
@@ -115,16 +117,12 @@ namespace SHARMLib {
 		} 
 	/* for s */
 
-
-		Cnm2f = arma::zeros<arma::mat>(n_degree + 1, n_degree + 1);
-		Snm2f = arma::zeros<arma::mat>(n_degree + 1, n_degree + 1);
-
 		for (int m = 0; m < n_degree + 1; ++m) {
 
 			for (int n = m; n < n_degree + 1; ++n) {
 
-				Cnm2f.row(n)(m) = Cnm [n][m];
-				Snm2f.row(n)(m) = Snm [n][m];
+				Cnm2f(n,m) = Cnm [n][m];
+				Snm2f(n,m) = Snm [n][m];
 
 			} 
 		/*// For n */
@@ -642,7 +640,6 @@ namespace SHARMLib {
 		const arma::vec & pos,
 		double ref_radius){
 
-
 		double r_sat = arma::norm(pos);
 		double x_sat = pos(0);
 		double y_sat = pos(1);