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

Merge pull request #1755 from aprilnovak/capi-cell-temperature

Browse source 
Allow set_contained to be passed through C-API for cell temp
This commit is contained in:
Patrick Shriwise 2021-02-05 14:27:25 -06:00 • committed by GitHub
commit 86e7403a21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/source/capi/index.rst
View file

@ -105,7 +105,7 @@ Functions
:return: Return status (negative if an error occurred)
:rtype: int
.. c:function:: int openmc_cell_set_temperature(index index, double T, const int32_t* instance)
.. c:function:: int openmc_cell_set_temperature(index index, double T, const int32_t* instance, bool set_contained)
Set the temperature of a cell.
@ -113,6 +113,8 @@ Functions
:param double T: Temperature in Kelvin
:param instance: Which instance of the cell. To set the temperature for all
instances, pass a null pointer.
:param set_contained: If the cell is not filled by a material, whether to set the temperatures
of all filled cells
:type instance: const int32_t*
:return: Return status (negative if an error occurred)
:rtype: int

2
include/openmc/capi.h
View file

@ -18,7 +18,7 @@ extern "C" {
int openmc_cell_set_name(int32_t index, const char* name);
int openmc_cell_set_fill(int32_t index, int type, int32_t n, const int32_t* indices);
int openmc_cell_set_id(int32_t index, int32_t id);
int openmc_cell_set_temperature(int32_t index, double T, const int32_t* instance);
int openmc_cell_set_temperature(int32_t index, double T, const int32_t* instance, bool set_contained = false);
int openmc_energy_filter_get_bins(int32_t index, const double** energies, size_t* n);
int openmc_energy_filter_set_bins(int32_t index, size_t n, const double* energies);
int openmc_energyfunc_filter_get_energy(int32_t index, size_t* n, const double** energy);

11
openmc/lib/cell.py
View file

@ -1,7 +1,7 @@
import sys
from collections.abc import Mapping, Iterable
from ctypes import c_int, c_int32, c_double, c_char_p, POINTER
from ctypes import c_int, c_int32, c_double, c_char_p, POINTER, c_bool
from weakref import WeakValueDictionary
import numpy as np
@ -43,7 +43,7 @@ _dll.openmc_cell_set_id.argtypes = [c_int32, c_int32]
_dll.openmc_cell_set_id.restype = c_int
_dll.openmc_cell_set_id.errcheck = _error_handler
_dll.openmc_cell_set_temperature.argtypes = [
c_int32, c_double, POINTER(c_int32)]
c_int32, c_double, POINTER(c_int32), c_bool]
_dll.openmc_cell_set_temperature.restype = c_int
_dll.openmc_cell_set_temperature.errcheck = _error_handler
_dll.openmc_get_cell_index.argtypes = [c_int32, POINTER(c_int32)]
@ -171,7 +171,7 @@ class Cell(_FortranObjectWithID):
_dll.openmc_cell_get_temperature(self._index, instance, T)
return T.value
def set_temperature(self, T, instance=None):
def set_temperature(self, T, instance=None, set_contained=False):
"""Set the temperature of a cell
Parameters
@ -180,13 +180,16 @@ class Cell(_FortranObjectWithID):
Temperature in K
instance : int or None
Which instance of the cell
set_contained: bool
If cell is not filled by a material, whether to set the temperature of
all filled cells
"""
if instance is not None:
instance = c_int32(instance)
_dll.openmc_cell_set_temperature(self._index, T, instance)
_dll.openmc_cell_set_temperature(self._index, T, instance, set_contained)
@property
def bounding_box(self):

4
src/cell.cpp
View file

@ -1092,7 +1092,7 @@ openmc_cell_set_fill(int32_t index, int type, int32_t n,
}
extern "C" int
openmc_cell_set_temperature(int32_t index, double T, const int32_t* instance)
openmc_cell_set_temperature(int32_t index, double T, const int32_t* instance, bool set_contained)
{
if (index < 0 || index >= model::cells.size()) {
strcpy(openmc_err_msg, "Index in cells array is out of bounds.");
@ -1101,7 +1101,7 @@ openmc_cell_set_temperature(int32_t index, double T, const int32_t* instance)
int32_t instance_index = instance ? *instance : -1;
try {
model::cells[index]->set_temperature(T, instance_index);
model::cells[index]->set_temperature(T, instance_index, set_contained);
} catch (const std::exception& e) {
set_errmsg(e.what());
return OPENMC_E_UNASSIGNED;