crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-26 13:15:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Only instantiate custom source once

Browse source 
In the existing custom_source implementation, the source will only be
created once. This is much more efficient than the custom serialized
source, where each sampling will create a new instance of the class.
As there could be many samples, this introduces an overhead,
particularly if the operations to instantiate the class are not trivial.
This implementation defines an abstract class, which is then used by the
custom classes to allow the custom serialized class to be created based
on the plugin, sampled from, and then destroyed.
Update documentation and test to reflect this.
This commit is contained in:
Dan Short 2020-08-03 17:38:12 +01:00
parent 8bb10563c1
commit 9c1b318e78
6 changed files with 181 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/source.cpp
View file

@ -44,12 +44,13 @@ std::vector<SourceDistribution> external_sources;
namespace {
void* custom_source_library;
using sample_t = Particle::Bank (*)(uint64_t* seed);
sample_t custom_source_function;
std::string custom_source_parameters;
using serialized_sample_t = Particle::Bank (*)(uint64_t* seed, const char* parameters);
serialized_sample_t custom_serialized_source_function;
void* custom_source_library;
CustomSource* custom_source;
destroy_custom_source_t* destroy_custom_source;
}
@ -379,9 +380,12 @@ void load_custom_source_library()
using sample_t = Particle::Bank (*)(uint64_t* seed);
custom_source_function = reinterpret_cast<sample_t>(dlsym(custom_source_library, "sample_source"));
} else {
// get the function from the library using the provided serialization
using sample_t = Particle::Bank (*)(uint64_t* seed, const char* parameters);
custom_serialized_source_function = reinterpret_cast<sample_t>(dlsym(custom_source_library, "sample_source"));
// get the functions to create and destroy the CustomSource from the library
create_custom_source_t* create_custom_source = (create_custom_source_t*) dlsym(custom_source_library, "create");
destroy_custom_source = (destroy_custom_source_t*) dlsym(custom_source_library, "destroy");
// create a pointer to an instance of the CustomSource
custom_source = create_custom_source(custom_source_parameters.c_str());
}
// check for any dlsym errors
@ -399,6 +403,11 @@ void load_custom_source_library()
void close_custom_source_library()
{
if (custom_source) {
// destroy the CustomSource if it exists
destroy_custom_source(custom_source);
}
#ifdef HAS_DYNAMIC_LINKING
dlclose(custom_source_library);
#else
@ -412,7 +421,8 @@ Particle::Bank sample_custom_source_library(uint64_t* seed)
if (custom_source_parameters.empty()) {
return custom_source_function(seed);
} else {
return custom_serialized_source_function(seed, custom_source_parameters.c_str());
// sample from the instance of the CustomSource
return custom_source->sample_source(seed);
}
}