Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove duplicated code #5289

Merged
merged 1 commit into from
Jul 13, 2023
Merged

remove duplicated code #5289

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 0 additions & 6 deletions source/simulator/parameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1886,12 +1886,6 @@ namespace aspect
if (x_compositional_field_types.size() == 1)
x_compositional_field_types = std::vector<std::string> (n_compositional_fields, x_compositional_field_types[0]);

// For backwards compatibility, convert a field named "density_field" without type to a density field
const unsigned int density_index = std::find(names_of_compositional_fields.begin(), names_of_compositional_fields.end(), "density_field")
- names_of_compositional_fields.begin();
if (density_index != n_compositional_fields && x_compositional_field_types[density_index] == "unspecified")
x_compositional_field_types[density_index] = "density";

// TODO ASPECT_4: Require all field types to be specified by the user
// Remove the following code block
for (unsigned int i=0; i<n_compositional_fields; ++i)
Expand Down