Skip to content

Commit 06ca9fa

Browse files
authored
Merge pull request GeodynamicWorldBuilder#846 from MFraters/fix_continental_plate_composition_case
fix continental plate composition case.
2 parents 6c95487 + 72c0958 commit 06ca9fa

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

source/world_builder/features/continental_plate.cc

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -229,27 +229,28 @@ namespace WorldBuilder
229229

230230
}
231231
break;
232-
case 2: // composition
233-
234-
for (const auto &composition_model: composition_models)
235-
{
236-
output[entry_in_output[i_property]] = composition_model->get_composition(position_in_cartesian_coordinates,
237-
position_in_natural_coordinates,
238-
depth,
239-
properties[i_property][1],
240-
output[entry_in_output[i_property]],
241-
min_depth_local,
242-
max_depth_local);
243-
244-
WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Composition is not a number: " << output[entry_in_output[i_property]]
245-
<< ", based on a composition model with the name " << composition_model->get_name() << ", in feature " << this->name);
246-
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Composition is not a finite: " << output[entry_in_output[i_property]]
247-
<< ", based on a composition model with the name " << composition_model->get_name() << ", in feature " << this->name);
248-
249-
}
250-
251-
break;
252-
}
232+
}
233+
case 2: // composition
234+
{
235+
for (const auto &composition_model: composition_models)
236+
{
237+
output[entry_in_output[i_property]] = composition_model->get_composition(position_in_cartesian_coordinates,
238+
position_in_natural_coordinates,
239+
depth,
240+
properties[i_property][1],
241+
output[entry_in_output[i_property]],
242+
min_depth_local,
243+
max_depth_local);
244+
245+
WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Composition is not a number: " << output[entry_in_output[i_property]]
246+
<< ", based on a composition model with the name " << composition_model->get_name() << ", in feature " << this->name);
247+
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Composition is not a finite: " << output[entry_in_output[i_property]]
248+
<< ", based on a composition model with the name " << composition_model->get_name() << ", in feature " << this->name);
249+
250+
}
251+
252+
break;
253+
}
253254
case 3: // grains
254255
{
255256
WorldBuilder::grains grains(output,properties[i_property][2],entry_in_output[i_property]);

0 commit comments

Comments
 (0)