Skip to content

Extending min depth for plugins within a feature #834

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

Open
alanjyu wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Extending min depth for plugins within a feature #834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14761e2
Extend min depth for Continental Plate models
alanjyu Jan 27, 2025
06709fd
Add this function to the Oceanic Plate model
alanjyu Jan 27, 2025
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
122 changes: 61 additions & 61 deletions doc/world_builder_declarations.schema.json
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions doc/world_builder_declarations_closed.md
View file
Open in desktop

Large diffs are not rendered by default.

122 changes: 61 additions & 61 deletions doc/world_builder_declarations_open.md
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 6 additions & 7 deletions include/world_builder/features/continental_plate_models/composition/random.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,22 +75,21 @@ namespace WorldBuilder
const double depth,
const unsigned int composition_number,
double composition,
const double feature_min_depth,
const double feature_max_depth) const override final;
const double min_depth_feature,
const double max_depth_feature) const override final;


private:
// Random composition submodule parameters

double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::vector<unsigned int> compositions;
std::vector<double> min_value;
std::vector<double> max_value;
Operations operation;

};
} // namespace Composition
} // namespace ContinentalPlateModels
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/continental_plate_models/composition/uniform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ namespace WorldBuilder
private:
// uniform composition submodule parameters

double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::vector<unsigned int> compositions;
std::vector<double> fractions;
Operations operation;
Expand Down
12 changes: 6 additions & 6 deletions include/world_builder/features/continental_plate_models/grains/random_uniform_distribution.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ namespace WorldBuilder
const double depth,
const unsigned int composition_number,
WorldBuilder::grains grains,
const double feature_min_depth,
const double feature_max_depth) const override final;
const double min_depth_feature,
const double max_depth_feature) const override final;

private:
// uniform grains submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::vector<unsigned int> grains;
std::vector<unsigned int> compositions;
std::string operation;
Expand Down
8 changes: 4 additions & 4 deletions ..._builder/features/continental_plate_models/grains/random_uniform_distribution_deflected.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ namespace WorldBuilder
const double feature_max_depth) const override final;

private:
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::vector<unsigned int> grains;
std::vector<unsigned int> compositions;
std::string operation;
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/continental_plate_models/grains/uniform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ namespace WorldBuilder

private:
// uniform grains submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::vector<unsigned int> grains;
std::vector<unsigned int> compositions;
std::string operation;
Expand Down
21 changes: 4 additions & 17 deletions include/world_builder/features/continental_plate_models/temperature/adiabatic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,26 +82,13 @@ namespace WorldBuilder

private:
// adiabatic temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
/**
* Todo
*/
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double potential_mantle_temperature;


/**
* Todo
*/
double thermal_expansion_coefficient;

/**
* Todo
*/
double specific_heat;

Operations operation;

};
Expand Down
14 changes: 7 additions & 7 deletions include/world_builder/features/continental_plate_models/temperature/chapman.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@ namespace WorldBuilder
const double depth,
const double gravity,
double temperature,
const double feature_min_depth,
const double feature_max_depth) const override final;
const double min_depth_feature,
const double max_depth_feature) const override final;


private:
double top_temperature;
double top_temperature_entry;
double top_heat_flux;
double thermal_conductivity;
double heat_production_per_unit_volume;
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
Operations operation;

};
Expand Down
16 changes: 8 additions & 8 deletions include/world_builder/features/continental_plate_models/temperature/linear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,18 @@ namespace WorldBuilder
const double depth,
const double gravity,
double temperature,
const double feature_min_depth,
const double feature_max_depth) const override final;
const double min_depth_feature,
const double max_depth_feature) const override final;


private:
// linear temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double top_temperature;
double bottom_temperature;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double top_temperature_entry;
double bottom_temperature_entry;
Operations operation;

};
Expand Down
12 changes: 6 additions & 6 deletions include/world_builder/features/continental_plate_models/temperature/uniform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,16 @@ namespace WorldBuilder
const double depth,
const double gravity,
double temperature,
const double feature_min_depth,
const double feature_max_depth) const override final;
const double min_depth_feature,
const double max_depth_feature) const override final;


private:
// uniform temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double temperature;
Operations operation;

Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/continental_plate_models/velocity/uniform_raw.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ namespace WorldBuilder

private:
// uniform raw velocity submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::array<double,3> velocity;
Operations operation;

Expand Down
14 changes: 7 additions & 7 deletions include/world_builder/features/oceanic_plate_models/composition/tian2019_water_content.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,20 +84,20 @@ namespace WorldBuilder
const double depth,
const unsigned int composition_number,
double composition,
const double feature_min_depth,
const double feature_max_depth) const override final;
const double min_depth_feature,
const double max_depth_feature) const override final;


private:
// TianWaterContent composition submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double density; // Density used to compute the lithostatic pressure
Objects::Surface max_depth_surface;
std::vector<unsigned int> compositions;
Operations operation;
double max_water_content;
Operations operation;

enum LithologyName
{
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/oceanic_plate_models/composition/uniform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ namespace WorldBuilder

private:
// uniform composition submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
std::vector<unsigned int> compositions;
std::vector<double> fractions;
Operations operation;
Expand Down
22 changes: 4 additions & 18 deletions include/world_builder/features/oceanic_plate_models/temperature/adiabatic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,28 +81,14 @@ namespace WorldBuilder

private:
// adiabatic temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
/**
* Todo
*/
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double potential_mantle_temperature;


/**
* Todo
*/
double thermal_expansion_coefficient;

/**
* Todo
*/
double specific_heat;

Operations operation;

};
} // namespace Temperature
} // namespace OceanicPlateModels
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/oceanic_plate_models/temperature/half_space_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ namespace WorldBuilder

private:
// plate model temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double top_temperature;
double bottom_temperature;
std::pair<std::vector<double>,std::vector<double>> spreading_velocities;
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/oceanic_plate_models/temperature/linear.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ namespace WorldBuilder

private:
// linear temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double top_temperature;
double bottom_temperature;
Operations operation;
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/oceanic_plate_models/temperature/plate_model.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ namespace WorldBuilder

private:
// plate model temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double top_temperature;
double bottom_temperature;
std::pair<std::vector<double>,std::vector<double>> spreading_velocities;
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/oceanic_plate_models/temperature/plate_model_constant_age.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ namespace WorldBuilder

private:
// plate model constant age temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double top_temperature;
double bottom_temperature;
double plate_age;
Expand Down
8 changes: 4 additions & 4 deletions include/world_builder/features/oceanic_plate_models/temperature/uniform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ namespace WorldBuilder

private:
// uniform temperature submodule parameters
double min_depth;
Objects::Surface min_depth_surface;
double max_depth;
Objects::Surface max_depth_surface;
double min_depth_entry;
Objects::Surface min_depth_surface_entry;
double max_depth_entry;
Objects::Surface max_depth_surface_entry;
double temperature;
Operations operation;

Expand Down
Loading
Loading