Add implementation for mpex fields.

Author: cianciosa

graph_driver/mpex_example.sh

@@ -0,0 +1 @@
+./graph_driver/xrays --absorption_model=weak_damping --dispersion=ordinary_wave --endtime=0.15 --equilibrium=mpex --equilibrium_file=../graph_tests/mpex.nc --mpex_ps1_current=4500 --mpex_ps2_current=4500 --mpex_tr1_current=600 --mpex_tr2_current=160 --mpex_ne_scale=1.0E19 --mpex_te_scale=1000 --init_kx --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=0.2 --init_y_dist=normal --init_y_mean=0.0 --init_y_sigma=0.05 --init_z_dist=normal --init_z_mean=2.0 --init_z_sigma=0.0 --num_rays=1 --num_times=100000 --solver=rk4 --sub_steps=100 --use_cyl_xy

graph_driver/xrays.cpp

@@ -378,6 +378,14 @@ equilibrium::shared<T, SAFE_MATH> make_equilibrium(const commandline::parser &cl
 
     if (eq == "efit") {
         return equilibrium::make_efit<T, SAFE_MATH> (file_name);
+    } else if (eq == "mpex") {
+        return equilibrium::make_mpex<T, SAFE_MATH> (file_name,
+                                                     cl.get_option_value<T> ("mpex_ne_scale"),
+                                                     cl.get_option_value<T> ("mpex_te_scale"),
+                                                     cl.get_option_value<T> ("mpex_ps1_current"),
+                                                     cl.get_option_value<T> ("mpex_ps2_current"),
+                                                     cl.get_option_value<T> ("mpex_tr1_current"),
+                                                     cl.get_option_value<T> ("mpex_tr2_current"));
     } else {
         return equilibrium::make_vmec<T, SAFE_MATH> (file_name);
     }
@@ -976,13 +984,21 @@ commandline::parser parse_commandline(int argc, const char * argv[]) {
     });
     cl.add_option("equilibrium",       true,  "Equilibrium to use.", {
         "efit",
-        "vmec"
+        "vmec",
+        "mpex"
     });
     cl.add_option("equilibrium_file",  true,  "File to read the equilibrium from.");
     cl.add_option("init_w_dist",       true,  "Distribution function for wave frequency.", {
         "uniform",
         "normal"
     });
+    cl.add_option("mpex_ne_scale",     true,  "Scale factor for electron density profiles.");
+    cl.add_option("mpex_te_scale",     true,  "Scale factor for electron temperature profiles.");
+    cl.add_option("mpex_ps2_current",  true,  "Current for the ps2 coil set.");
+    cl.add_option("mpex_ps1_current",  true,  "Current for the ps1 coil set.");
+    cl.add_option("mpex_ps2_current",  true,  "Current for the ps2 coil set.");
+    cl.add_option("mpex_tr1_current",  true,  "Current for the tr1 coil set.");
+    cl.add_option("mpex_tr2_current",  true,  "Current for the tr2 coil set.");
     cl.add_option("init_w_mean",       true,  "Mean value for the wave frequency distribution function.");
     cl.add_option("init_w_sigma",      true,  "Standard deviation of for the wave frequency distribution function.");
     cl.add_option("init_kx_dist",      true,  "Distribution function for wave number in the x direction.", {
@@ -1097,6 +1113,11 @@ int main(int argc, const char * argv[]) {
 
     typedef double base;
 
+    std::cout << "Using " << cl.get_option_value<std::string> ("equilibrium") << " equilibrium from " << cl.get_option_value<std::string> ("equilibrium_file") << std::endl;
+    std::cout << "Using " << cl.get_option_value<std::string> ("dispersion") << " dispersion relation" << std::endl;
+    std::cout << "Using " << cl.get_option_value<std::string> ("solver") <<  " solver methd" << std::endl;
+    std::cout << "Using " << cl.get_option_value<std::string> ("absorption_model") << " absorption model" << std::endl << std::endl;
+
     trace_ray<base> (cl, num_times, sub_steps, num_rays);
     calculate_power<std::complex<base>, use_safe_math> (cl,
                                                         num_times,