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

update mac segfault fix format, fix python settings name

Browse source
This commit is contained in:
stchaker 2023-04-20 12:21:10 -04:00
parent e3e659ca83
commit 5713ef700c
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/settings.h
View file

@ -73,7 +73,7 @@ extern std::string path_statepoint; //!< path to a statepoint file
// This is required because the c_str() may not be the first thing in
// std::string. Sometimes it is, but it seems libc++ may not be like that
// on some computers, like the intel Mac.
extern "C" char const* path_statepoint_c; //!< C pointer to statepoint file name
extern "C" const char* path_statepoint_c; //!< C pointer to statepoint file name
extern "C" int32_t n_inactive; //!< number of inactive batches
extern "C" int32_t max_lost_particles; //!< maximum number of lost particles

2
openmc/lib/settings.py
View file

@ -56,7 +56,7 @@ class _Settings:
@property
def path_statepoint(self):
path = c_char_p.in_dll(_dll, 'path_statepoint').value
path = c_char_p.in_dll(_dll, 'path_statepoint_c').value
return path.decode()
@property

3
src/settings.cpp
View file

@ -82,8 +82,7 @@ std::string path_output;
std::string path_particle_restart;
std::string path_sourcepoint;
std::string path_statepoint;
std::string empty_string = "";
char const* path_statepoint_c {empty_string.c_str()};
const char* path_statepoint_c {path_statepoint.c_str()};
int32_t n_inactive {0};
int32_t max_lost_particles {10};