Skip to content

Commit 14610c7

Browse files
thelferthelfer
committed
update Julia support
1 parent b209b69 commit 14610c7

5 files changed

Lines changed: 56 additions & 56 deletions

File tree

‎bindings/julia/include/MGIS/Julia/JuliaUtilities.ixx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace mgis {
2626
void expose_std_vector(jlcxx::Module& m, const char* const n) {
2727
m.add_type<std::vector<T>>(n)
2828
.method("length",
29-
[](const std::vector<T>& v) -> std::int64_t {
29+
[](const std::vector<T>& v) noexcept -> std::int64_t {
3030
return static_cast<std::int64_t>(v.size());
3131
})
3232
.method("setindex!",

‎bindings/julia/src/Behaviour.cxx‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "MGIS/Julia/JuliaUtilities.hxx"
1919

2020
void declareBehaviour(jlcxx::Module &m) {
21+
using mgis::behaviour::BehaviourDescription;
2122
using mgis::behaviour::Behaviour;
2223
using mgis::behaviour::FiniteStrainBehaviourOptions;
2324
using mgis::behaviour::Hypothesis;
@@ -31,32 +32,32 @@ void declareBehaviour(jlcxx::Module &m) {
3132
&mgis::behaviour::setParameter;
3233
void (*setParameter2)(const Behaviour &, const std::string &, const int) =
3334
&mgis::behaviour::setParameter;
34-
double (*getParameterDefaultValue1)(const Behaviour &, const std::string &) =
35+
double (*getParameterDefaultValue1)(const BehaviourDescription &, const std::string &) =
3536
&mgis::behaviour::getParameterDefaultValue<double>;
36-
int (*getParameterDefaultValue2)(const Behaviour &, const std::string &) =
37+
int (*getParameterDefaultValue2)(const BehaviourDescription &, const std::string &) =
3738
&mgis::behaviour::getParameterDefaultValue<int>;
38-
unsigned short (*getParameterDefaultValue3)(const Behaviour &,
39+
unsigned short (*getParameterDefaultValue3)(const BehaviourDescription &,
3940
const std::string &) =
4041
&mgis::behaviour::getParameterDefaultValue<unsigned short>;
41-
bool (*hasBounds)(const Behaviour &, const std::string &) =
42+
bool (*hasBounds)(const BehaviourDescription &, const std::string &) =
4243
mgis::behaviour::hasBounds;
43-
bool (*hasLowerBound)(const Behaviour &, const std::string &) =
44+
bool (*hasLowerBound)(const BehaviourDescription &, const std::string &) =
4445
mgis::behaviour::hasLowerBound;
45-
bool (*hasUpperBound)(const Behaviour &, const std::string &) =
46+
bool (*hasUpperBound)(const BehaviourDescription &, const std::string &) =
4647
mgis::behaviour::hasUpperBound;
47-
long double (*getLowerBound)(const Behaviour &, const std::string &) =
48+
long double (*getLowerBound)(const BehaviourDescription &, const std::string &) =
4849
mgis::behaviour::getLowerBound;
49-
long double (*getUpperBound)(const Behaviour &, const std::string &) =
50+
long double (*getUpperBound)(const BehaviourDescription &, const std::string &) =
5051
mgis::behaviour::getUpperBound;
51-
bool (*hasPhysicalBounds)(const Behaviour &, const std::string &) =
52+
bool (*hasPhysicalBounds)(const BehaviourDescription &, const std::string &) =
5253
mgis::behaviour::hasPhysicalBounds;
53-
bool (*hasLowerPhysicalBound)(const Behaviour &, const std::string &) =
54+
bool (*hasLowerPhysicalBound)(const BehaviourDescription &, const std::string &) =
5455
mgis::behaviour::hasLowerPhysicalBound;
55-
bool (*hasUpperPhysicalBound)(const Behaviour &, const std::string &) =
56+
bool (*hasUpperPhysicalBound)(const BehaviourDescription &, const std::string &) =
5657
mgis::behaviour::hasUpperPhysicalBound;
57-
long double (*getLowerPhysicalBound)(const Behaviour &, const std::string &) =
58+
long double (*getLowerPhysicalBound)(const BehaviourDescription &, const std::string &) =
5859
mgis::behaviour::getLowerPhysicalBound;
59-
long double (*getUpperPhysicalBound)(const Behaviour &, const std::string &) =
60+
long double (*getUpperPhysicalBound)(const BehaviourDescription &, const std::string &) =
6061
mgis::behaviour::getUpperPhysicalBound;
6162
//!
6263
m.add_bits<FiniteStrainBehaviourOptions::StressMeasure>(
@@ -85,21 +86,21 @@ void declareBehaviour(jlcxx::Module &m) {
8586
//!
8687
m.add_type<FiniteStrainBehaviourOptions>("FiniteStrainBehaviourOptions")
8788
.method("get_stress_measure",
88-
[](const FiniteStrainBehaviourOptions &o) {
89+
[](const FiniteStrainBehaviourOptions &o) noexcept {
8990
return o.stress_measure;
9091
})
9192
.method("set_stress_measure!",
9293
[](FiniteStrainBehaviourOptions &o,
93-
const FiniteStrainBehaviourOptions::StressMeasure &s) {
94+
const FiniteStrainBehaviourOptions::StressMeasure &s) noexcept {
9495
o.stress_measure = s;
9596
})
9697
.method("get_tangent_operator",
97-
[](const FiniteStrainBehaviourOptions &o) {
98+
[](const FiniteStrainBehaviourOptions &o) noexcept {
9899
return o.tangent_operator;
99100
})
100101
.method("set_tangent_operator!",
101102
[](FiniteStrainBehaviourOptions &o,
102-
const FiniteStrainBehaviourOptions::TangentOperator &to) {
103+
const FiniteStrainBehaviourOptions::TangentOperator &to) noexcept {
103104
o.tangent_operator = to;
104105
});
105106
//
@@ -134,16 +135,16 @@ void declareBehaviour(jlcxx::Module &m) {
134135
Behaviour::FINITESTRAINKINEMATIC_F_CAUCHY);
135136
//
136137
m.add_type<Behaviour>("Behaviour")
137-
.method("get_library", [](const Behaviour &b) { return b.library; })
138-
.method("get_behaviour", [](const Behaviour &b) { return b.behaviour; })
139-
.method("get_hypothesis", [](const Behaviour &b) { return b.hypothesis; })
140-
.method("get_function", [](const Behaviour &b) { return b.function; })
141-
.method("get_source", [](const Behaviour &b) { return b.source; })
138+
.method("get_library", [](const Behaviour &b) noexcept { return b.library; })
139+
.method("get_behaviour", [](const Behaviour &b) noexcept { return b.behaviour; })
140+
.method("get_hypothesis", [](const Behaviour &b) noexcept { return b.hypothesis; })
141+
.method("get_function", [](const Behaviour &b) noexcept { return b.function; })
142+
.method("get_source", [](const Behaviour &b) noexcept { return b.source; })
142143
.method("get_tfel_version",
143-
[](const Behaviour &b) { return b.tfel_version; })
144-
.method("get_behaviour_type", [](const Behaviour &b) { return b.btype; })
145-
.method("get_symmetry", [](const Behaviour &b) { return b.symmetry; })
146-
.method("get_kinematic", [](const Behaviour &b) { return b.kinematic; })
144+
[](const Behaviour &b) noexcept { return b.tfel_version; })
145+
.method("get_behaviour_type", [](const Behaviour &b) noexcept { return b.btype; })
146+
.method("get_symmetry", [](const Behaviour &b) noexcept { return b.symmetry; })
147+
.method("get_kinematic", [](const Behaviour &b) noexcept { return b.kinematic; })
147148
.method("get_material_properties",
148149
[](const Behaviour &b) { return b.mps; })
149150
.method("get_internal_state_variables",

‎bindings/julia/src/BehaviourData.cxx‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,35 +20,34 @@ void declareBehaviourData();
2020

2121
void declareBehaviourData(jlcxx::Module& m) {
2222
using mgis::behaviour::BehaviourData;
23+
using mgis::behaviour::BehaviourDataView;
2324
using mgis::behaviour::State;
24-
void (*update)(BehaviourData&) = &mgis::behaviour::update;
25-
void (*revert)(BehaviourData&) = &mgis::behaviour::revert;
26-
mgis::behaviour::BehaviourDataView (*make_view)(BehaviourData&) =
27-
&mgis::behaviour::make_view;
2825

2926
m.add_type<BehaviourData>("BehaviourData")
3027
.constructor<const mgis::behaviour::Behaviour&>()
3128
.method("get_time_increment",
32-
[](BehaviourData& d) -> mgis::real& { return d.dt; })
29+
[](BehaviourData& d) noexcept -> mgis::real& { return d.dt; })
3330
.method("set_time_increment!",
34-
[](BehaviourData& d, const mgis::real v) { d.dt = v; })
31+
[](BehaviourData& d, const mgis::real v) noexcept { d.dt = v; })
3532
.method("get_tangent_operator",
36-
[](BehaviourData& d) -> std::vector<mgis::real>& { return d.K; })
33+
[](BehaviourData& d) noexcept -> std::vector<mgis::real>& { return d.K; })
3734
.method("set_tangent_operator!",
3835
[](BehaviourData& d, const jlcxx::ArrayRef<mgis::real>& a) {
3936
mgis::julia::assign(d.K, a);
4037
})
4138
.method("get_time_increment_increase_factor",
42-
[](BehaviourData& d) -> mgis::real& { return d.rdt; })
39+
[](BehaviourData& d) noexcept -> mgis::real& { return d.rdt; })
4340
.method("set_time_increment_increase_factor!",
44-
[](BehaviourData& d, const mgis::real& v) -> void { d.rdt = v; })
45-
.method("get_s0", [](BehaviourData& d) -> State& { return d.s0; })
46-
.method("get_s1", [](BehaviourData& d) -> State& { return d.s1; })
41+
[](BehaviourData& d, const mgis::real& v) noexcept -> void { d.rdt = v; })
42+
.method("get_s0", [](BehaviourData& d) noexcept -> State& { return d.s0; })
43+
.method("get_s1", [](BehaviourData& d) noexcept -> State& { return d.s1; })
4744
.method("get_initial_state",
48-
[](BehaviourData& d) -> State& { return d.s0; })
45+
[](BehaviourData& d) noexcept -> State& { return d.s0; })
4946
.method("get_final_state",
50-
[](BehaviourData& d) -> State& { return d.s1; })
51-
.method("update", update)
52-
.method("revert", revert)
53-
.method("make_view", make_view);
54-
} // end of declareBehaviourData
47+
[](BehaviourData& d) noexcept -> State& { return d.s1; })
48+
.method("update", [](BehaviourData& d) { update(d); })
49+
.method("revert", [](BehaviourData& d) { revert(d); })
50+
.method("make_view", [](BehaviourData& d) -> BehaviourDataView {
51+
return make_view(d);})
52+
;
53+
} // end of declareBehaviourData

‎bindings/julia/src/State.cxx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,45 +24,45 @@ void declareState(jlcxx::Module& m) {
2424
m.add_type<State>("State")
2525
.constructor<const Behaviour&>()
2626
.method("set_stored_energy!",
27-
[](State& s, const mgis::real v) { s.stored_energy = v; })
27+
[](State& s, const mgis::real v) noexcept { s.stored_energy = v; })
2828
.method("get_stored_energy",
29-
[](State& s) -> mgis::real& { return s.stored_energy; })
29+
[](State& s) noexcept -> mgis::real& { return s.stored_energy; })
3030
.method("set_dissipated_energy!",
31-
[](State& s, const mgis::real v) { s.dissipated_energy = v; })
31+
[](State& s, const mgis::real v) noexcept { s.dissipated_energy = v; })
3232
.method("get_dissipated_energy",
33-
[](State& s) -> mgis::real& { return s.dissipated_energy; })
33+
[](State& s) noexcept -> mgis::real& { return s.dissipated_energy; })
3434
.method("get_gradients",
35-
[](State& s) -> std::vector<mgis::real>& { return s.gradients; })
35+
[](State& s) noexcept -> std::vector<mgis::real>& { return s.gradients; })
3636
.method("set_gradients!",
3737
[](State& s, const jlcxx::ArrayRef<mgis::real>& a) {
3838
mgis::julia::assign(s.gradients, a);
3939
})
4040
.method("get_thermodynamic_forces",
41-
[](State& s) -> std::vector<mgis::real>& {
41+
[](State& s) noexcept -> std::vector<mgis::real>& {
4242
return s.thermodynamic_forces;
4343
})
4444
.method("set_thermodynamic_forces!",
4545
[](State& s, const jlcxx::ArrayRef<mgis::real>& a) {
4646
mgis::julia::assign(s.thermodynamic_forces, a);
4747
})
4848
.method("get_material_properties",
49-
[](State& s) -> std::vector<mgis::real>& {
49+
[](State& s) noexcept -> std::vector<mgis::real>& {
5050
return s.material_properties;
5151
})
5252
.method("set_material_properties!",
5353
[](State& s, const jlcxx::ArrayRef<mgis::real>& a) {
5454
mgis::julia::assign(s.material_properties, a);
5555
})
5656
.method("get_internal_state_variables",
57-
[](State& s) -> std::vector<mgis::real>& {
57+
[](State& s) noexcept -> std::vector<mgis::real>& {
5858
return s.internal_state_variables;
5959
})
6060
.method("set_internal_state_variables!",
6161
[](State& s, const jlcxx::ArrayRef<mgis::real>& a) {
6262
mgis::julia::assign(s.internal_state_variables, a);
6363
})
6464
.method("get_external_state_variables",
65-
[](State& s) -> std::vector<mgis::real>& {
65+
[](State& s) noexcept -> std::vector<mgis::real>& {
6666
return s.external_state_variables;
6767
})
6868
.method("set_external_state_variables!",
@@ -90,4 +90,4 @@ void declareState(jlcxx::Module& m) {
9090
mgis::behaviour::setExternalStateVariable(s, n, v);
9191
});
9292

93-
} // end of declareState
93+
} // end of declareState

‎bindings/julia/src/Variable.cxx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ void declareVariable(jlcxx::Module& m) {
2424
m.set_const("Tensor", Variable::TENSOR);
2525
m.set_const("TENSOR", Variable::TENSOR);
2626
m.add_type<Variable>("Variable")
27-
.method("get_name", [](const Variable& v) { return v.name; })
28-
.method("get_type", [](const Variable& v) { return v.type; })
27+
.method("get_name", [](const Variable& v) noexcept { return v.name; })
28+
.method("get_type", [](const Variable& v) noexcept { return v.type; })
2929
.method("get_variable_size",
3030
[](const Variable& v, const mgis::behaviour::Hypothesis h) {
3131
return mgis::behaviour::getVariableSize(v, h);

0 commit comments

Comments
 (0)