Skip to content

Commit

Permalink
Merge pull request #660 from jdannberg/temperature_typos
Browse files Browse the repository at this point in the history 
fix typo
  • Loading branch information
@MFraters
MFraters authored Feb 20, 2024
2 parents 0b03a7e + ebeade4 commit 29e2468
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions source/world_builder/features/continental_plate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,9 +186,9 @@ namespace WorldBuilder
min_depth_local,
max_depth_local);

WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temparture is not a number: " << output[entry_in_output[i_property]]
WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temperature is not a number: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temparture is not a finite: " << output[entry_in_output[i_property]]
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temperature is not a finite: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/continental_plate_models/temperature/linear.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ namespace WorldBuilder
(depth - min_depth_local) *
((bottom_temperature_local - top_temperature_local) / (max_depth_local_local - min_depth_local_local));

WBAssert(!std::isnan(new_temperature), "Temparture is not a number: " << new_temperature
WBAssert(!std::isnan(new_temperature), "Temperature is not a number: " << new_temperature
<< ", based on a temperature model with the name " << this->name);
WBAssert(std::isfinite(new_temperature), "Temparture is not a finite: " << new_temperature
WBAssert(std::isfinite(new_temperature), "Temperature is not a finite: " << new_temperature
<< ", based on a temperature model with the name " << this->name
<< ", top_temperature_local = " << top_temperature_local << ", depth = " << depth << ", min_depth_local = " << min_depth_local
<< ", bottom_temperature_local= " << bottom_temperature_local << ", top_temperature_local=" << top_temperature_local
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/fault.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ namespace WorldBuilder

WBAssert(!std::isnan(temperature_current_section), "Temperature is not a number: " << temperature_current_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(temperature_current_section), "Temparture is not finite: " << temperature_current_section
WBAssert(std::isfinite(temperature_current_section), "Temperature is not finite: " << temperature_current_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand All @@ -543,7 +543,7 @@ namespace WorldBuilder

WBAssert(!std::isnan(temperature_next_section), "Temperature is not a number: " << temperature_next_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(temperature_next_section), "Temparture is not a finite: " << temperature_next_section
WBAssert(std::isfinite(temperature_next_section), "Temperature is not a finite: " << temperature_next_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/mantle_layer.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ namespace WorldBuilder
min_depth_local,
max_depth_local);

WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temparture is not a number: " << output[entry_in_output[i_property]]
WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temperature is not a number: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temparture is not a finite: " << output[entry_in_output[i_property]]
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temperature is not a finite: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/oceanic_plate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,9 +181,9 @@ namespace WorldBuilder
min_depth_local,
max_depth_local);

WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temparture is not a number: " << output[entry_in_output[i_property]]
WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temperature is not a number: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temparture is not a finite: " << output[entry_in_output[i_property]]
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temperature is not a finite: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/oceanic_plate_models/temperature/plate_model.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,14 @@ namespace WorldBuilder

}

WBAssert(!std::isnan(temperature), "Temparture inside plate model is not a number: " << temperature
WBAssert(!std::isnan(temperature), "Temperature inside plate model is not a number: " << temperature
<< ". Relevant variables: bottom_temperature_local = " << bottom_temperature_local
<< ", top_temperature = " << top_temperature
<< ", max_depth = " << max_depth
<< ", spreading_velocity = " << ridge_parameters.first
<< ", thermal_diffusivity = " << thermal_diffusivity
<< ", age = " << age << '.');
WBAssert(std::isfinite(temperature), "Temparture inside plate model is not a finite: " << temperature << ". Relevant variables: bottom_temperature_local = " << bottom_temperature_local
WBAssert(std::isfinite(temperature), "Temperature inside plate model is not a finite: " << temperature << ". Relevant variables: bottom_temperature_local = " << bottom_temperature_local
<< ", top_temperature = " << top_temperature
<< ", spreading_velocity = " << ridge_parameters.first
<< ", thermal_diffusivity = " << thermal_diffusivity
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/oceanic_plate_models/temperature/plate_model_constant_age.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,13 @@ namespace WorldBuilder
std::exp(-1.0 * i * i * Consts::PI * Consts::PI * thermal_diffusivity * plate_age / (max_depth * max_depth)));
}

WBAssert(!std::isnan(temperature), "Temparture inside plate model constant age is not a number: " << temperature
WBAssert(!std::isnan(temperature), "Temperature inside plate model constant age is not a number: " << temperature
<< ". Relevant variables: bottom_temperature_local = " << bottom_temperature_local
<< ", top_temperature = " << top_temperature
<< ", max_depth = " << max_depth
<< ", thermal_diffusivity = " << thermal_diffusivity
<< ", age = " << plate_age << '.');
WBAssert(std::isfinite(temperature), "Temparture inside plate model constant age is not a finite: " << temperature << ". Relevant variables: bottom_temperature_local = " << bottom_temperature_local
WBAssert(std::isfinite(temperature), "Temperature inside plate model constant age is not a finite: " << temperature << ". Relevant variables: bottom_temperature_local = " << bottom_temperature_local
<< ", top_temperature = " << top_temperature
<< ", thermal_diffusivity = " << thermal_diffusivity
<< ", age = " << plate_age << '.');
Expand Down
4 changes: 2 additions & 2 deletions source/world_builder/features/plume.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ namespace WorldBuilder
min_depth,
max_depth);

WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temparture is not a number: " << output[entry_in_output[i_property]]
WBAssert(!std::isnan(output[entry_in_output[i_property]]), "Temperature is not a number: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temparture is not finite: " << output[entry_in_output[i_property]]
WBAssert(std::isfinite(output[entry_in_output[i_property]]), "Temperature is not finite: " << output[entry_in_output[i_property]]
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand Down
8 changes: 4 additions & 4 deletions source/world_builder/features/subducting_plate.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,9 +542,9 @@ namespace WorldBuilder
distance_from_planes,
additional_parameters);

WBAssert(!std::isnan(temperature_current_section), "Temparture is not a number: " << temperature_current_section
WBAssert(!std::isnan(temperature_current_section), "Temperature is not a number: " << temperature_current_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(temperature_current_section), "Temparture is not a finite: " << temperature_current_section
WBAssert(std::isfinite(temperature_current_section), "Temperature is not a finite: " << temperature_current_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand All @@ -560,9 +560,9 @@ namespace WorldBuilder
distance_from_planes,
additional_parameters);

WBAssert(!std::isnan(temperature_next_section), "Temparture is not a number: " << temperature_next_section
WBAssert(!std::isnan(temperature_next_section), "Temperature is not a number: " << temperature_next_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);
WBAssert(std::isfinite(temperature_next_section), "Temparture is not a finite: " << temperature_next_section
WBAssert(std::isfinite(temperature_next_section), "Temperature is not a finite: " << temperature_next_section
<< ", based on a temperature model with the name " << temperature_model->get_name() << ", in feature " << this->name);

}
Expand Down

0 comments on commit 29e2468

Please sign in to comment.