Skip to content

AsciiDataLayered: remove redundant data_dir #6769

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

Merged
merged 1 commit into from
Nov 12, 2025
Merged

AsciiDataLayered: remove redundant data_dir #6769

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions include/aspect/structured_data.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -685,12 +685,6 @@ namespace aspect
std::vector<std::unique_ptr<aspect::Utilities::StructuredDataLookup<dim-1>>> lookups;

private:

/**
* Directory in which the data files are present.
*/
std::string data_directory;

/**
* Filenames of data files.
*/
Expand Down
20 changes: 1 addition & 19 deletions source/structured_data.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@ namespace aspect
number_of_layer_boundaries = data_file_names.size();
for (unsigned int i=0; i<number_of_layer_boundaries; ++i)
{
const std::string filename = data_directory + data_file_names[i];
const std::string filename = this->data_directory + data_file_names[i];
AssertThrow(Utilities::fexists(filename, this->get_mpi_communicator()) || filename_is_url(filename),
ExcMessage (std::string("Ascii data file <")
+
Expand Down Expand Up @@ -1677,20 +1677,6 @@ namespace aspect

prm.enter_subsection (subsection_name);
{
prm.declare_entry ("Data directory",
default_directory,
Patterns::DirectoryName (),
"The name of a directory that contains the model data. This path "
"may either be absolute (if starting with a `/') or relative to "
"the current directory. The path may also include the special "
"text `$ASPECT_SOURCE_DIR' which will be interpreted as the path "
"in which the ASPECT source files were located when ASPECT was "
"compiled. This interpretation allows, for example, to reference "
"files located in the `data/' subdirectory of ASPECT. A trailing "
"slash at the end of the directory path is optional; the plugin "
"will automatically append a '/' when the parameters are parsed if "
"it is missing. ");

prm.declare_entry ("Data file names",
default_filename,
Patterns::List (Patterns::Anything()),
Expand Down Expand Up @@ -1719,10 +1705,6 @@ namespace aspect

prm.enter_subsection(subsection_name);
{
data_directory = Utilities::expand_ASPECT_SOURCE_DIR(prm.get ("Data directory"));
// ensure directory ends with a slash so callers can safely do data_directory + filename
if (!data_directory.empty() && data_directory.back() != '/')
data_directory.push_back('/');
data_file_names = Utilities::split_string_list(prm.get ("Data file names"), ',');
interpolation_scheme = prm.get("Interpolation scheme");
}
Expand Down