fix windows compilation

exoclime · Jun 22, 2020 · 0c35cf0 · 0c35cf0
1 parent bf87a7b
commit 0c35cf0
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/define.h b/define.h
@@ -3,6 +3,10 @@
 #define _USE_MATH_DEFINES  //for Windows
 #endif
 
+#ifndef DEFINE_H
+#define DEFINE_H
+
+
 //Build Data
 
 #ifndef GIT_DESCRIBE
@@ -26,7 +30,7 @@
 #endif
 
 
-#define VERSION 2.01
+#define VERSION 2.02
 
 
 #define def_T0 296.0 		//Reference Temperature in K
@@ -201,3 +205,4 @@ struct Line{
 	long long int *iiLimitsCT_m, *iiLimitsCT_d;	//limits for all blocks, mapped memory
 
 };
+#endif
diff --git a/docs/index.rst b/docs/index.rst
@@ -74,9 +74,9 @@ Atomic Opacities plots
 
 .. toctree::
   :maxdepth: 1
-
   helios_k/atoms.rst
 
+
 Citations
 ~~~~~~~~~
 

diff --git a/heliosk.cu b/heliosk.cu
@@ -1,11 +1,11 @@
+#include "define.h" //must be on top for Windows compilation
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
 #include <thrust/sort.h>
 #include <thrust/device_ptr.h>
 
-#include "define.h"
 
 #include "host.h"
 #include "ISO.h"
@@ -482,8 +482,12 @@ printf("%g %g %g %g\n", param.numax, param.numin, param.dnu, (param.numax - para
 	}
 	//Allocate Species array 
 	double *SpeciesA_h;	//abundance
-	SpeciesA_h = (double*)malloc((param.nSpecies) * sizeof(double));
-	char SpeciesN_h[param.nSpecies][160];
+	char **SpeciesN_h;
+	SpeciesA_h = (double*)malloc(param.nSpecies * sizeof(double));
+	SpeciesN_h = (char**)malloc(param.nSpecies * sizeof(char*));
+	for(int i = 0; i < param.nSpecies; ++i){
+		SpeciesN_h[i] = (char*)malloc(160 * sizeof(char));
+	}
 	if(param.useSpeciesFile == 1){
 		er = readSpeciesFile(param, SpeciesN_h, SpeciesA_h);
 		if(er == 0) return 0;

diff --git a/host.h b/host.h
@@ -540,7 +540,7 @@ __host__ int readPFile(Param &param, double *P_h){
 	return 1;
 }
 
-__host__ int readSpeciesFile(Param &param, char (*SpeciesN_h)[160], double *SpeciesA_h){
+__host__ int readSpeciesFile(Param &param, char **SpeciesN_h, double *SpeciesA_h){
 	FILE *Speciesfile;
 	Speciesfile = fopen(param.SpeciesFilename, "r");
 	int er;

diff --git a/voigt.h b/voigt.h
@@ -1,4 +1,3 @@
-
 // *********************************************
 //This function calculates the Series Sigma1. Sigma2 and Sigma3 (Equations 27, 28, and 29) from Alg 916
 //The parameter def_TOL sets a tolerance where to truncate the series