Commit 53799ff8 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Merge branch 'gold_data' into 'main' 

Add test against gold data for efit profiles. Fix errors in the density...

See merge request !34
parents a282f181 b617807b

graph_driver/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ add_test ( 
                                                      --init_w_dist=normal

                                                      --init_w_mean=700

                                                      --init_w_sigma=10.0

                                                      --init_x_mean=1.0

                                                      --init_x_mean=2.5

                                                      --init_y_dist=normal

                                                      --init_y_mean=0.0

                                                      --init_y_sigma=0.05
@@ -29,4 +29,5 @@ add_test ( 
                                                      --solver=rk4

                                                      --sub_steps=100

                                                      --use_cyl_xy

                                                      --seed

)

graph_driver/efit_example.sh

+1 −1
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 --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=2.5 --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

+7 −4
Original line number Diff line number Diff line
@@ -101,8 +101,10 @@ void set_xy_variables(const commandline::parser &cl, 
                const T phi_sigma = cl.get_option_value<T> ("init_y_sigma");

                auto phi_dist = set_distribution(phi_mean, phi_sigma);

                for (size_t i = 0; i < num_rays; i++) {

                    x->set(i, static_cast<T> (radius_dist(engine))*cos(static_cast<T> (phi_dist(engine))));

                    y->set(i, static_cast<T> (radius_dist(engine))*sin(static_cast<T> (phi_dist(engine))));

                    const T r = static_cast<T> (phi_dist(engine));

                    const T phi = static_cast<T> (phi_dist(engine));

                    x->set(i, r*cos(phi));

                    y->set(i, r*sin(phi));

                }

            } else {

                for (size_t i = 0; i < num_rays; i++) {
@@ -116,8 +118,9 @@ void set_xy_variables(const commandline::parser &cl, 
                const T phi_sigma = cl.get_option_value<T> ("init_y_sigma");

                auto phi_dist = set_distribution(phi_mean, phi_sigma);

                for (size_t i = 0; i < num_rays; i++) {

                    x->set(i, radius_mean*cos(static_cast<T> (phi_dist(engine))));

                    y->set(i, radius_mean*sin(static_cast<T> (phi_dist(engine))));

                    const T phi = static_cast<T> (phi_dist(engine));

                    x->set(i, radius_mean*cos(phi));

                    y->set(i, radius_mean*sin(phi));

                }

            } else {

                for (size_t i = 0; i < num_rays; i++) {

graph_framework.xcodeproj/project.pbxproj

+98 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
/* Begin PBXBuildFile section */

		C70D93152A30FF4E006A4227 /* special_functions.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C70D93132A30FF4E006A4227 /* special_functions.hpp */; };

		C713426A2947F39400672AD4 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C71342682947F36100672AD4 /* Metal.framework */; };

		C7170CC02C66A228003274E2 /* efit_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C7D3C5B02C654AD3008AD8C6 /* efit_test.cpp */; };

		C7170CC12C66A238003274E2 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C71342682947F36100672AD4 /* Metal.framework */; };

		C73690382A38C958001733B0 /* node.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C79141AE22DA9C3000E0BA0D /* node.hpp */; };

		C73690392A38C958001733B0 /* piecewise.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C70B705629F4F86A00098AA0 /* piecewise.hpp */; };

		C736903A2A38C958001733B0 /* workflow.hpp in Headers */ = {isa = PBXBuildFile; fileRef = C7922EEB29E0ABDF000BB9C7 /* workflow.hpp */; };
@@ -143,6 +145,15 @@ 
/* End PBXContainerItemProxy section */



/* Begin PBXCopyFilesBuildPhase section */

		C7170CB72C66A10D003274E2 /* CopyFiles */ = {

			isa = PBXCopyFilesBuildPhase;

			buildActionMask = 2147483647;

			dstPath = /usr/share/man/man1/;

			dstSubfolderSpec = 0;

			files = (

			);

			runOnlyForDeploymentPostprocessing = 1;

		};

		C736902F2A38C498001733B0 /* CopyFiles */ = {

			isa = PBXCopyFilesBuildPhase;

			buildActionMask = 2147483647;
@@ -281,6 +292,7 @@ 
		C71342652947D57900672AD4 /* metal_context.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = metal_context.hpp; sourceTree = "<group>"; };

		C71342682947F36100672AD4 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };

		C7167B222AC5CE8500E03131 /* fix_NaN.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = fix_NaN.py; sourceTree = "<group>"; };

		C7170CB92C66A10D003274E2 /* efit_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = efit_test; sourceTree = BUILT_PRODUCTS_DIR; };

		C717CB8D2A02E361008FBDD8 /* FindNetCDF.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; path = FindNetCDF.cmake; sourceTree = "<group>"; };

		C71C1FF527F5379D006997C2 /* dispersion.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = dispersion.hpp; sourceTree = "<group>"; };

		C71C1FF627F5F5A8006997C2 /* solver.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = solver.hpp; sourceTree = "<group>"; };
@@ -322,6 +334,7 @@ 
		C7B677DA29E464AE00D3ADC6 /* cpu_context.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = cpu_context.hpp; sourceTree = "<group>"; };

		C7CEA0042948D02A00F61D09 /* timing.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = timing.hpp; sourceTree = "<group>"; };

		C7CEA0052948EB0F00F61D09 /* cuda_context.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = cuda_context.hpp; sourceTree = "<group>"; };

		C7D3C5B02C654AD3008AD8C6 /* efit_test.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; path = efit_test.cpp; sourceTree = "<group>"; };

		C7E134492A3CB3EC0083F6A7 /* output.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = output.hpp; sourceTree = "<group>"; };

		C7E5643E28A2A16F000F31A2 /* backend_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = backend_test; sourceTree = BUILT_PRODUCTS_DIR; };

		C7E5644A28A2A1C5000F31A2 /* dispersion_test */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dispersion_test; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -337,6 +350,14 @@ 
/* End PBXFileReference section */



/* Begin PBXFrameworksBuildPhase section */

		C7170CB62C66A10D003274E2 /* Frameworks */ = {

			isa = PBXFrameworksBuildPhase;

			buildActionMask = 2147483647;

			files = (

				C7170CC12C66A238003274E2 /* Metal.framework in Frameworks */,

			);

			runOnlyForDeploymentPostprocessing = 0;

		};

		C736902E2A38C498001733B0 /* Frameworks */ = {

			isa = PBXFrameworksBuildPhase;

			buildActionMask = 2147483647;
@@ -519,6 +540,7 @@ 
				C73BBE7B29F816E50027BB7F /* piecewise_test */,

				C73690312A38C498001733B0 /* erfi_test */,

				C74DF4572AA8BC7300319113 /* graph_benchmark */,

				C7170CB92C66A10D003274E2 /* efit_test */,

			);

			name = Products;

			sourceTree = "<group>";
@@ -569,6 +591,7 @@ 
				C7931E6A28073BCA0033B488 /* CMakeLists.txt */,

				C736902B2A38AC0E001733B0 /* erfi_test.cpp */,

				C7931E7328074F540033B488 /* backend_test.cpp */,

				C7D3C5B02C654AD3008AD8C6 /* efit_test.cpp */,

				C7931E6B28073BCA0033B488 /* dispersion_test.cpp */,

				C7931E6C28073BCA0033B488 /* solver_test.cpp */,

				C7931E6D28073BCA0033B488 /* arithmetic_test.cpp */,
@@ -615,6 +638,23 @@ 
/* End PBXHeadersBuildPhase section */



/* Begin PBXNativeTarget section */

		C7170CB82C66A10D003274E2 /* efit_test */ = {

			isa = PBXNativeTarget;

			buildConfigurationList = C7170CBF2C66A10D003274E2 /* Build configuration list for PBXNativeTarget "efit_test" */;

			buildPhases = (

				C7170CB52C66A10D003274E2 /* Sources */,

				C7170CB62C66A10D003274E2 /* Frameworks */,

				C7170CB72C66A10D003274E2 /* CopyFiles */,

			);

			buildRules = (

			);

			dependencies = (

			);

			name = efit_test;

			productName = efit_test;

			productReference = C7170CB92C66A10D003274E2 /* efit_test */;

			productType = "com.apple.product-type.tool";

		};

		C73690302A38C498001733B0 /* erfi_test */ = {

			isa = PBXNativeTarget;

			buildConfigurationList = C73690352A38C498001733B0 /* Build configuration list for PBXNativeTarget "erfi_test" */;
@@ -893,6 +933,9 @@ 
				LastUpgradeCheck = 1540;

				ORGANIZATIONNAME = "Cianciosa, Mark R.";

				TargetAttributes = {

					C7170CB82C66A10D003274E2 = {

						CreatedOnToolsVersion = 15.4;

					};

					C73690302A38C498001733B0 = {

						CreatedOnToolsVersion = 14.3;

					};
@@ -968,11 +1011,20 @@ 
				C73BBE7A29F816E50027BB7F /* piecewise_test */,

				C73690302A38C498001733B0 /* erfi_test */,

				C74DF4562AA8BC7300319113 /* graph_benchmark */,

				C7170CB82C66A10D003274E2 /* efit_test */,

			);

		};

/* End PBXProject section */



/* Begin PBXSourcesBuildPhase section */

		C7170CB52C66A10D003274E2 /* Sources */ = {

			isa = PBXSourcesBuildPhase;

			buildActionMask = 2147483647;

			files = (

				C7170CC02C66A228003274E2 /* efit_test.cpp in Sources */,

			);

			runOnlyForDeploymentPostprocessing = 0;

		};

		C736902D2A38C498001733B0 /* Sources */ = {

			isa = PBXSourcesBuildPhase;

			buildActionMask = 2147483647;
@@ -1163,6 +1215,43 @@ 
/* End PBXTargetDependency section */



/* Begin XCBuildConfiguration section */

		C7170CBD2C66A10D003274E2 /* Debug */ = {

			isa = XCBuildConfiguration;

			buildSettings = {

				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;

				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";

				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";

				CODE_SIGN_STYLE = Automatic;

				GCC_C_LANGUAGE_STANDARD = gnu17;

				GCC_PREPROCESSOR_DEFINITIONS = (

					"EFIT_GOLD_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/efit_gold.nc\\\"",

					"DEBUG=1",

					"$(inherited)",

				);

				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;

				MACOSX_DEPLOYMENT_TARGET = 14.5;

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

			name = Debug;

		};

		C7170CBE2C66A10D003274E2 /* Release */ = {

			isa = XCBuildConfiguration;

			buildSettings = {

				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;

				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";

				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";

				CODE_SIGN_STYLE = Automatic;

				GCC_C_LANGUAGE_STANDARD = gnu17;

				GCC_PREPROCESSOR_DEFINITIONS = (

					"EFIT_GOLD_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/efit_gold.nc\\\"",

					"$(inherited)",

				);

				LOCALIZATION_PREFERS_STRING_CATALOGS = YES;

				MACOSX_DEPLOYMENT_TARGET = 14.5;

				PRODUCT_NAME = "$(TARGET_NAME)";

			};

			name = Release;

		};

		C73690362A38C498001733B0 /* Debug */ = {

			isa = XCBuildConfiguration;

			buildSettings = {
@@ -2090,6 +2179,15 @@ 
/* End XCBuildConfiguration section */



/* Begin XCConfigurationList section */

		C7170CBF2C66A10D003274E2 /* Build configuration list for PBXNativeTarget "efit_test" */ = {

			isa = XCConfigurationList;

			buildConfigurations = (

				C7170CBD2C66A10D003274E2 /* Debug */,

				C7170CBE2C66A10D003274E2 /* Release */,

			);

			defaultConfigurationIsVisible = 0;

			defaultConfigurationName = Release;

		};

		C73690352A38C498001733B0 /* Build configuration list for PBXNativeTarget "erfi_test" */ = {

			isa = XCConfigurationList;

			buildConfigurations = (

graph_framework.xcodeproj/xcshareddata/xcschemes/graph_driver.xcscheme

+5 −1
Original line number Diff line number Diff line
@@ -64,6 +64,10 @@ 
            argument = "--num_rays=1"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--seed"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--num_times=100000"

            isEnabled = "YES">
@@ -133,7 +137,7 @@ 
            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument

            argument = "--init_x_mean=1.0"

            argument = "--init_x_mean=2.5"

            isEnabled = "YES">

         </CommandLineArgument>

         <CommandLineArgument