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 TODOS that are backwards incompatible #5543

Merged
merged 1 commit into from
Jan 20, 2024
Merged

Remove TODOS that are backwards incompatible #5543

Show file tree
Hide file tree
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/material_model/visco_plastic.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,11 +389,6 @@ namespace aspect

std::vector<unsigned int> n_phases_for_each_composition = phase_function.n_phases_for_each_composition();

// TODO ASPECT_3: Require all field types to be specified by the user
// Remove the following code block *and* replace following code snippets matching
// MaterialUtilities::make_csv_substring(prm.get("*"), indices) with
// prm.get("*")
// BEGIN CODE BLOCK
const std::vector<unsigned int> indices = this->introspection().chemical_composition_field_indices();

// Currently, phase_function.n_phases_for_each_composition() returns a list of length
Expand All @@ -409,7 +404,6 @@ namespace aspect
n_phase_transitions_for_each_chemical_composition.push_back(n_phases_for_each_composition[i+1] - 1);
n_phases += n_phases_for_each_composition[i+1];
}
// END CODE BLOCK

// Equation of state parameters
equation_of_state.initialize_simulator (this->get_simulator());
Expand Down
2 changes: 0 additions & 2 deletions source/simulator/parameters.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1868,8 +1868,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]);

// 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)
if (x_compositional_field_types[i] == "unspecified")
{
Expand Down