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

Merge branch 'single_pass' into 'main' 

Avoid regenerating expressions in EFIT equilibira by utilizing cached values.

See merge request !32
parents c10f5cf1 e4e27691

graph_framework.xcodeproj/project.pbxproj

+2 −6
Original line number Diff line number Diff line
@@ -1666,6 +1666,7 @@ 
				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 13.5;

				OTHER_CPLUSPLUSFLAGS = "";

				OTHER_LDFLAGS = "$(inherited)";

				PRODUCT_NAME = "$(TARGET_NAME)";

				SDKROOT = macosx;

			};
@@ -1682,12 +1683,7 @@ 
				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 13.5;

				OTHER_CPLUSPLUSFLAGS = "";

				OTHER_LDFLAGS = (

					"-lnetcdf",

					"-ld_classic",

					"-rpath",

					/usr/local/lib,

				);

				OTHER_LDFLAGS = "$(inherited)";

				PRODUCT_NAME = "$(TARGET_NAME)";

				SDKROOT = macosx;

			};

graph_framework.xcodeproj/xcshareddata/xcschemes/graph_driver.xcscheme

+97 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
      </BuildableProductRunnable>

      <CommandLineArguments>

         <CommandLineArgument

            argument = "--num_rays=100000"

            argument = "--num_rays=1"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument
@@ -72,6 +72,102 @@ 
            argument = "--sub_steps=100"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--absorption_model=weak_damping"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--dispersion=ordinary_wave"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--endtime=2.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--equilibrium=efit"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--equilibrium_file=/Users/m4c/Projects/graph_framework/graph_tests/efit.nc"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_kx_mean=-700.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_ky_dist=normal"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_ky_mean=-100.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_ky_sigma=10.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_kz_dist=normal"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_kz_mean=0.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_kz_sigma=10.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_w_dist=normal"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_w_mean=700"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_w_sigma=10.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_x_mean=1.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_y_dist=normal"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_y_mean=0.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_y_sigma=0.05"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_z_dist=normal"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_z_mean=0.0"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_z_sigma=0.05"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--solver=rk4"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--use_cyl_xy"

            isEnabled = "YES">

         </CommandLineArgument>

      </CommandLineArguments>

   </LaunchAction>

   <ProfileAction

graph_framework/equilibrium.hpp

+197 −162

File changed.

Preview size limit exceeded, changes collapsed.