Skip to content

Commit d024f89

Browse files
thelferthelfer
committed
apply the format.sh script
1 parent 581995a commit d024f89

File tree

104 files changed

+2653
-2558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+2653
-2558
lines changed

‎bindings/c/src/Behaviour.cxx

+853-847
Large diffs are not rendered by default.

‎bindings/c/src/BehaviourData.cxx

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* \file bindings/c/src/BehaviourData.cxx
3-
* \brief
3+
* \brief
44
* \author Thomas Helfer
55
* \date 02/08/2018
66
* \copyright (C) Copyright Thomas Helfer 2018.
@@ -42,7 +42,7 @@ mgis_status mgis_bv_behaviour_data_get_behaviour(
4242
return mgis_report_success();
4343
} // end of mgis_bv_update_behaviour_data
4444

45-
mgis_status mgis_bv_update_behaviour_data(mgis_bv_BehaviourData* const d){
45+
mgis_status mgis_bv_update_behaviour_data(mgis_bv_BehaviourData* const d) {
4646
if (d == nullptr) {
4747
return mgis_report_failure("invalid argument (behaviour data is null)");
4848
}
@@ -52,7 +52,7 @@ mgis_status mgis_bv_update_behaviour_data(mgis_bv_BehaviourData* const d){
5252
return mgis_handle_cxx_exception();
5353
}
5454
return mgis_report_success();
55-
} // end of mgis_bv_update_behaviour_data
55+
} // end of mgis_bv_update_behaviour_data
5656

5757
mgis_status mgis_bv_revert_behaviour_data(mgis_bv_BehaviourData* const d) {
5858
if (d == nullptr) {
@@ -64,19 +64,19 @@ mgis_status mgis_bv_revert_behaviour_data(mgis_bv_BehaviourData* const d) {
6464
return mgis_handle_cxx_exception();
6565
}
6666
return mgis_report_success();
67-
} // end of mgis_bv_revert_behaviour_data
67+
} // end of mgis_bv_revert_behaviour_data
6868

69-
mgis_status mgis_bv_behaviour_data_get_state_0(
70-
mgis_bv_State** s, mgis_bv_BehaviourData* const d) {
69+
mgis_status mgis_bv_behaviour_data_get_state_0(mgis_bv_State** s,
70+
mgis_bv_BehaviourData* const d) {
7171
if (d == nullptr) {
7272
return mgis_report_failure("invalid argument (behaviour data is null)");
7373
}
7474
*s = &(d->s0);
7575
return mgis_report_success();
7676
} // end of mgis_bv_behaviour_data_get_state_0
7777

78-
mgis_status mgis_bv_behaviour_data_get_state_1(
79-
mgis_bv_State** s, mgis_bv_BehaviourData* const d) {
78+
mgis_status mgis_bv_behaviour_data_get_state_1(mgis_bv_State** s,
79+
mgis_bv_BehaviourData* const d) {
8080
if (d == nullptr) {
8181
return mgis_report_failure("invalid argument (behaviour data is null)");
8282
}
@@ -101,7 +101,7 @@ mgis_status mgis_bv_behaviour_data_get_time_step_scaling_factor(
101101
}
102102
*rdt = d->rdt;
103103
return mgis_report_success();
104-
} // end of mgis_bv_behaviour_data_get_time_step_scaling_factor
104+
} // end of mgis_bv_behaviour_data_get_time_step_scaling_factor
105105

106106
mgis_status mgis_bv_behaviour_data_get_tangent_operator(
107107
mgis_real** const K, mgis_bv_BehaviourData* const d) {
@@ -115,13 +115,13 @@ mgis_status mgis_bv_behaviour_data_get_tangent_operator(
115115
}
116116
*K = &(d->K[0]);
117117
return mgis_report_success();
118-
} // end of mgis_bv_behaviour_data_get_tangent_operator
118+
} // end of mgis_bv_behaviour_data_get_tangent_operator
119119

120120
mgis_status mgis_bv_free_behaviour_data(mgis_bv_BehaviourData** d) {
121121
try {
122122
delete *d;
123-
} catch (...) {
124-
return mgis_handle_cxx_exception();
123+
} catch (...) {
124+
return mgis_handle_cxx_exception();
125125
}
126126
*d = nullptr;
127127
return mgis_report_success();

‎bindings/c/src/BehaviourDataView.cxx

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* \file bindings/c/src/BehaviourDataView.cxx
3-
* \brief
3+
* \brief
44
* \author th202608
55
* \date 02/08/2018
66
* \copyright (C) Copyright Thomas Helfer 2018.
@@ -18,10 +18,10 @@ extern "C" {
1818

1919
mgis_status mgis_bv_make_behaviour_data_view(mgis_bv_BehaviourDataView* const v,
2020
mgis_bv_BehaviourData* const d) {
21-
if(v==nullptr){
21+
if (v == nullptr) {
2222
return mgis_report_failure("uninitialized view");
2323
}
24-
if(d==nullptr){
24+
if (d == nullptr) {
2525
return mgis_report_failure("uninitialized behaviour data");
2626
}
2727
try {
@@ -32,4 +32,4 @@ mgis_status mgis_bv_make_behaviour_data_view(mgis_bv_BehaviourDataView* const v,
3232
return mgis_report_success();
3333
} // end of mgis_bv_make_behaviour_data_view
3434

35-
} // end of extern "C"
35+
} // end of extern "C"

‎bindings/c/src/Hypothesis.cxx

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,7 @@ mgis_status mgis_bv_get_tensor_size(mgis_size_type* const s,
6262
*s = 5u;
6363
} else if (::strcmp(h, "Tridimensional") == 0) {
6464
*s = 9u;
65-
}
66-
else {
65+
} else {
6766
return mgis_report_failure(
6867
"mgis_bv_get_tensor_size: "
6968
"unsupported hypothesis");

‎bindings/c/src/Integrate.cxx

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* \file Integrate.cxx
3-
* \brief
3+
* \brief
44
* \author th202608
55
* \date 02/08/2018
66
* \copyright Copyright (C) 2006-2018 CEA/DEN, EDF R&D. All rights
@@ -21,7 +21,7 @@ extern "C" {
2121

2222
static mgis::behaviour::IntegrationType convertIntegrationType(
2323
const mgis_bv_IntegrationType i) {
24-
switch(i) {
24+
switch (i) {
2525
case MGIS_BV_PREDICTION_TANGENT_OPERATOR:
2626
return mgis::behaviour::IntegrationType::PREDICTION_TANGENT_OPERATOR;
2727
case MGIS_BV_PREDICTION_SECANT_OPERATOR:
@@ -37,12 +37,13 @@ static mgis::behaviour::IntegrationType convertIntegrationType(
3737
case MGIS_BV_INTEGRATION_TANGENT_OPERATOR:
3838
return mgis::behaviour::IntegrationType::INTEGRATION_TANGENT_OPERATOR;
3939
case MGIS_BV_INTEGRATION_CONSISTENT_TANGENT_OPERATOR:
40-
return mgis::behaviour::IntegrationType::INTEGRATION_CONSISTENT_TANGENT_OPERATOR;
40+
return mgis::behaviour::IntegrationType::
41+
INTEGRATION_CONSISTENT_TANGENT_OPERATOR;
4142
default:
4243
mgis::raise("convertIntegrationType: invalid integration type");
4344
}
4445
return mgis::behaviour::IntegrationType::INTEGRATION_NO_TANGENT_OPERATOR;
45-
} // end of convertIntegrationType
46+
} // end of convertIntegrationType
4647

4748
mgis_status mgis_bv_integrate(int* const r,
4849
mgis_bv_BehaviourDataView* const d,
@@ -55,8 +56,8 @@ mgis_status mgis_bv_integrate(int* const r,
5556
} // end of mgis_bv_integrate
5657

5758
mgis_status mgis_bv_integrate_2(int* const r,
58-
mgis_bv_BehaviourData* const d,
59-
const mgis_bv_Behaviour* const b) {
59+
mgis_bv_BehaviourData* const d,
60+
const mgis_bv_Behaviour* const b) {
6061
auto v = mgis::behaviour::make_view(*d);
6162
auto s = mgis_bv_integrate(r, &v, b);
6263
d->rdt = v.rdt;
@@ -79,7 +80,7 @@ mgis_status mgis_bv_integrate_material_data_manager(
7980
return mgis_handle_cxx_exception();
8081
}
8182
return mgis_report_success();
82-
} // end of mgis_bv_integrate_material_data_manager
83+
} // end of mgis_bv_integrate_material_data_manager
8384

8485
mgis_status mgis_bv_integrate_material_data_manager_part(
8586
int* const r,
@@ -98,6 +99,6 @@ mgis_status mgis_bv_integrate_material_data_manager_part(
9899
return mgis_handle_cxx_exception();
99100
}
100101
return mgis_report_success();
101-
} // end of mgis_bv_integrate_material_data_manager_part
102+
} // end of mgis_bv_integrate_material_data_manager_part
102103

103-
} // end of extern "C"
104+
} // end of extern "C"

‎bindings/c/src/MaterialDataManager.cxx

+21-14
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* \file MaterialDataManager.cxx
3-
* \brief
3+
* \brief
44
* \author Thomas Helfer
55
* \date 05/08/2018
66
* \copyright (C) Copyright Thomas Helfer 2018.
@@ -58,7 +58,8 @@ mgis_status mgis_bv_material_data_manager_initializer_get_state_0_initializer(
5858
mgis_bv_MaterialStateManagerInitializer** s,
5959
mgis_bv_MaterialDataManagerInitializer* const d) {
6060
if (d == nullptr) {
61-
return mgis_report_failure("invalid argument (material data manager is null)");
61+
return mgis_report_failure(
62+
"invalid argument (material data manager is null)");
6263
}
6364
*s = &(d->s0);
6465
return mgis_report_success();
@@ -68,7 +69,8 @@ mgis_status mgis_bv_material_data_manager_initializer_get_state_1_initializer(
6869
mgis_bv_MaterialStateManagerInitializer** s,
6970
mgis_bv_MaterialDataManagerInitializer* const d) {
7071
if (d == nullptr) {
71-
return mgis_report_failure("invalid argument (material data manager is null)");
72+
return mgis_report_failure(
73+
"invalid argument (material data manager is null)");
7274
}
7375
*s = &(d->s1);
7476
return mgis_report_success();
@@ -84,7 +86,7 @@ mgis_status mgis_bv_free_material_data_manager_initializer(
8486
return mgis_handle_cxx_exception();
8587
}
8688
return mgis_report_success();
87-
} // end of mgis_bv_free_material_data_manager_initializer
89+
} // end of mgis_bv_free_material_data_manager_initializer
8890

8991
mgis_status mgis_bv_create_material_data_manager(
9092
mgis_bv_MaterialDataManager** d,
@@ -136,7 +138,8 @@ mgis_status mgis_bv_create_material_data_manager_with_initializer(
136138
mgis_status mgis_bv_material_data_manager_get_state_0(
137139
mgis_bv_MaterialStateManager** s, mgis_bv_MaterialDataManager* const d) {
138140
if (d == nullptr) {
139-
return mgis_report_failure("invalid argument (material data manager is null)");
141+
return mgis_report_failure(
142+
"invalid argument (material data manager is null)");
140143
}
141144
*s = &(d->s0);
142145
return mgis_report_success();
@@ -145,7 +148,8 @@ mgis_status mgis_bv_material_data_manager_get_state_0(
145148
mgis_status mgis_bv_material_data_manager_get_state_1(
146149
mgis_bv_MaterialStateManager** s, mgis_bv_MaterialDataManager* const d) {
147150
if (d == nullptr) {
148-
return mgis_report_failure("invalid argument (material data manager is null)");
151+
return mgis_report_failure(
152+
"invalid argument (material data manager is null)");
149153
}
150154
*s = &(d->s1);
151155
return mgis_report_success();
@@ -164,27 +168,30 @@ mgis_status mgis_bv_material_data_manager_get_tangent_operator(
164168
}
165169
*K = &(Kv[0]);
166170
return mgis_report_success();
167-
} // end of mgis_bv_material_data_manager_get_tangent_operator
168-
169-
mgis_status mgis_bv_update_material_data_manager(mgis_bv_MaterialDataManager* const d){
171+
} // end of mgis_bv_material_data_manager_get_tangent_operator
172+
173+
mgis_status mgis_bv_update_material_data_manager(
174+
mgis_bv_MaterialDataManager* const d) {
170175
try {
171176
mgis::behaviour::update(*d);
172177
} catch (...) {
173178
return mgis_handle_cxx_exception();
174179
}
175180
return mgis_report_success();
176-
} // end of mgis_bv_update_material_data_manager
181+
} // end of mgis_bv_update_material_data_manager
177182

178-
mgis_status mgis_bv_revert_material_data_manager(mgis_bv_MaterialDataManager* const d){
183+
mgis_status mgis_bv_revert_material_data_manager(
184+
mgis_bv_MaterialDataManager* const d) {
179185
try {
180186
mgis::behaviour::revert(*d);
181187
} catch (...) {
182188
return mgis_handle_cxx_exception();
183189
}
184190
return mgis_report_success();
185-
} // end of mgis_bv_revert_material_data_manager
191+
} // end of mgis_bv_revert_material_data_manager
186192

187-
mgis_status mgis_bv_free_material_data_manager(mgis_bv_MaterialDataManager** d){
193+
mgis_status mgis_bv_free_material_data_manager(
194+
mgis_bv_MaterialDataManager** d) {
188195
try {
189196
delete *d;
190197
*d = nullptr;
@@ -193,6 +200,6 @@ mgis_status mgis_bv_free_material_data_manager(mgis_bv_MaterialDataManager** d){
193200
return mgis_handle_cxx_exception();
194201
}
195202
return mgis_report_success();
196-
} // end of mgis_bv_free_material_data_manager
203+
} // end of mgis_bv_free_material_data_manager
197204

198205
} // end of extern "C"

0 commit comments

Comments
 (0)