Commit c10f5cf1 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Merge branch 'command_line' into 'main' 

Add command line Interface

See merge request !31
parents 867f2f8c 486cdef4

CMakeLists.txt

+5 −6
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ project (rays CXX) 
#  Build Options

#-------------------------------------------------------------------------------

option (USE_PCH "Enable the use of precompiled headers" ON)

option (USE_STATIC "Limits the dyamics for testing." OFF)

option (SAVE_KERNEL_SOURCE "Writes the kernel source code to a file." OFF)



#-------------------------------------------------------------------------------
@@ -282,6 +281,11 @@ target_link_libraries (llvm_dep 


add_subdirectory (graph_framework)



#-------------------------------------------------------------------------------

#  Setup testing

#-------------------------------------------------------------------------------

enable_testing ()



#-------------------------------------------------------------------------------

#  Tool setup

#-------------------------------------------------------------------------------
@@ -308,11 +312,6 @@ endmacro () 
add_subdirectory (graph_driver)

add_subdirectory (graph_benchmark)



#-------------------------------------------------------------------------------

#  Setup testing

#-------------------------------------------------------------------------------

enable_testing ()



#-------------------------------------------------------------------------------

#  Define macro function to register tests.

#-------------------------------------------------------------------------------

graph_benchmark/xrays_bench.cpp

+2 −1
Original line number Diff line number Diff line
@@ -74,11 +74,12 @@ void bench_runner() { 


            const T endtime = static_cast<T> (1.0);

            const T dt = endtime/static_cast<T> (NUM_TIMES);

            auto dt_const = graph::constant(dt);



            solver::rk4<dispersion::cold_plasma<T>> solve(omega,

                                                          kx, ky, kz,

                                                          x, y, z,

                                                          t, dt,

                                                          t, dt_const,

                                                          eq, "",

                                                          local_num_rays,

                                                          thread_number);

graph_driver/CMakeLists.txt

+31 −0
Original line number Diff line number Diff line 
add_tool_target (xrays)



add_test (

    NAME xrays_test

    COMMAND $<TARGET_PROPERTY:xrays,BINARY_DIR>/xrays --absorption_model=weak_damping

                                                      --dispersion=ordinary_wave

                                                      --endtime=2.0

                                                      --equilibrium=efit

                                                      --equilibrium_file=${CMAKE_CURRENT_SOURCE_DIR}/../graph_tests/efit.nc

                                                      --init_kx_mean=-700.0

                                                      --init_ky_dist=normal

                                                      --init_ky_mean=-100.0

                                                      --init_ky_sigma=10.0

                                                      --init_kz_dist=normal

                                                      --init_kz_mean=0.0

                                                      --init_kz_sigma=10.0

                                                      --init_w_dist=normal

                                                      --init_w_mean=700

                                                      --init_w_sigma=10.0

                                                      --init_x_mean=1.0

                                                      --init_y_dist=normal

                                                      --init_y_mean=0.0

                                                      --init_y_sigma=0.05

                                                      --init_z_dist=normal

                                                      --init_z_mean=0.0

                                                      --init_z_sigma=0.05

                                                      --num_rays=1

                                                      --num_times=100000

                                                      --solver=rk4

                                                      --sub_steps=100

                                                      --use_cyl_xy

)

graph_driver/efit_example.sh

0 → 100755
+1 −0
Original line number Diff line number Diff line 
./graph_driver/xrays --absorption_model=weak_damping --dispersion=ordinary_wave --endtime=2.0 --equilibrium=efit --equilibrium_file=../graph_tests/efit.nc --init_kx_mean=-700.0 --init_ky_dist=normal --init_ky_mean=-100.0 --init_ky_sigma=10.0 --init_kz_dist=normal --init_kz_mean=0.0 --init_kz_sigma=10.0 --init_w_dist=normal --init_w_mean=700 --init_w_sigma=10.0 --init_x_mean=1.0 --init_y_dist=normal --init_y_mean=0.0 --init_y_sigma=0.05 --init_z_dist=normal --init_z_mean=0.0 --init_z_sigma=0.05 --num_rays=100000 --num_times=100000 --solver=rk4 --sub_steps=100 --use_cyl_xy --verbose

graph_driver/xrays.cpp

+612 −223

File changed.

Preview size limit exceeded, changes collapsed.