diff --git a/SConstruct b/SConstruct
index 72cded6..2d9a0b4 100644
--- a/SConstruct
+++ b/SConstruct
@@ -31,9 +31,13 @@ env = Environment(CXX=CXX, CXXFLAGS=cxx_flags)
if 'darwin' in sys.platform:
print("Using Mac OS X compile options.")
- env.Append(CPPPATH=['/opt/local/include', '/usr/include/malloc'])
+ if 'HOMEBREW_PREFIX' in os.environ:
+ env.Append(CPPPATH=['/opt/local/include','/usr/include/malloc','/opt/homebrew/include'])
+ env.Append(LIBPATH=['/opt/homebrew/lib'])
+ else:
+ env.Append(CPPPATH=['/opt/local/include', '/usr/include/malloc'])
+ env.Append(LIBPATH=['/opt/local/lib'])
env.Append(LIBS=['boost_program_options-mt'])
- env.Append(LIBPATH=['/opt/local/lib'])
elif 'linux' in sys.platform:
print("Using Linux compile options.")
env.Append(CPPPATH=['/usr/include'])
diff --git a/config/ebtel.example.cfg.xml b/config/ebtel.example.cfg.xml
index 254e071..52d3112 100644
--- a/config/ebtel.example.cfg.xml
+++ b/config/ebtel.example.cfg.xml
@@ -3,7 +3,7 @@
5000.0
1.0
1e+300
- 40.0e+8
+ 80e+8
1.0
False
True
@@ -12,8 +12,8 @@
False
False
False
- variable
- ebtel++_results_file.txt
+ coronal
+ /Users/reep/Documents/Forks/ebtel_abundances/src/data/cor_L80_H0.01_t20.txt
1e-6
0.5
2.0
@@ -28,9 +28,7 @@
3.5e-5
1.0
-
-
-
+
diff --git a/tests/test_compare_hydrad.py b/tests/test_compare_hydrad.py
index 4e9b1fc..7bf3ac2 100644
--- a/tests/test_compare_hydrad.py
+++ b/tests/test_compare_hydrad.py
@@ -26,6 +26,7 @@ def base_config():
'calculate_dem': False,
'save_terms': False,
'use_adaptive_solver': True,
+ 'radiation': 'power_law',
'adaptive_solver_error': 1e-8,
'adaptive_solver_safety': 0.5,
'c1_cond0': 6.0,
diff --git a/tests/test_compare_idl.py b/tests/test_compare_idl.py
index 1dea552..5938a59 100644
--- a/tests/test_compare_idl.py
+++ b/tests/test_compare_idl.py
@@ -23,6 +23,7 @@ def base_config():
'use_flux_limiting': False,
'use_adaptive_solver': False,
'calculate_dem': False,
+ 'radiation': 'power_law',
'save_terms': False,
'adaptive_solver_error': 1e-6,
'adaptive_solver_safety': 0.5,
diff --git a/tests/test_single_fluid.py b/tests/test_single_fluid.py
index 2938963..198615c 100644
--- a/tests/test_single_fluid.py
+++ b/tests/test_single_fluid.py
@@ -25,6 +25,7 @@ def base_config():
'calculate_dem': False,
'save_terms': False,
'use_adaptive_solver': True,
+ 'radiation': 'power_law',
'adaptive_solver_error': 1e-6,
'adaptive_solver_safety': 0.5,
'c1_cond0': 2.0,
diff --git a/tests/test_solver.py b/tests/test_solver.py
index 8d82620..e6d833d 100644
--- a/tests/test_solver.py
+++ b/tests/test_solver.py
@@ -23,6 +23,7 @@ def base_config():
'use_flux_limiting': True,
'calculate_dem': True,
'save_terms': False,
+ 'radiation': 'power_law',
'adaptive_solver_error': 1e-6,
'adaptive_solver_safety': 0.5,
'c1_cond0': 2.0,