Skip to content

Commit

Permalink
add radiation to test configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeffrey Reep committed Jun 3, 2024
1 parent 6bad73a commit f2117d0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 8 deletions.
8 changes: 6 additions & 2 deletions SConstruct
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
10 changes: 4 additions & 6 deletions config/ebtel.example.cfg.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<total_time>5000.0</total_time>
<tau>1.0</tau>
<tau_max>1e+300</tau_max>
<loop_length>40.0e+8</loop_length>
<loop_length>80e+8</loop_length>
<saturation_limit>1.0</saturation_limit>
<force_single_fluid>False</force_single_fluid>
<use_c1_loss_correction>True</use_c1_loss_correction>
Expand All @@ -12,8 +12,8 @@
<calculate_dem>False</calculate_dem>
<save_terms>False</save_terms>
<use_adaptive_solver>False</use_adaptive_solver>
<radiation>variable</radiation>
<output_filename>ebtel++_results_file.txt</output_filename>
<radiation>coronal</radiation>
<output_filename>/Users/reep/Documents/Forks/ebtel_abundances/src/data/cor_L80_H0.01_t20.txt</output_filename>
<adaptive_solver_error>1e-6</adaptive_solver_error>
<adaptive_solver_safety>0.5</adaptive_solver_safety>
<c1_cond0>2.0</c1_cond0>
Expand All @@ -28,9 +28,7 @@
<background>3.5e-5</background>
<partition>1.0</partition>
<events>
<event magnitude="0.1" rise_start="0.0" rise_end="50.0" decay_start="50.0" decay_end="100.0"/>
<event magnitude="0.15" rise_start="200.0" rise_end="250.0" decay_start="250.0" decay_end="300.0"/>
<event magnitude="0.05" rise_start="1000.0" rise_end="1050.0" decay_start="1050.0" decay_end="1100.0"/>
<event magnitude="0.01" rise_start="0" rise_end="10.0" decay_start="10.0" decay_end="20.0"/>
</events>
</heating>
</root>
1 change: 1 addition & 0 deletions tests/test_compare_hydrad.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions tests/test_compare_idl.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions tests/test_single_fluid.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions tests/test_solver.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit f2117d0

Please sign in to comment.