diff --git a/app/main.cc b/app/main.cc index 990c97913..9d59b0d77 100644 --- a/app/main.cc +++ b/app/main.cc @@ -27,11 +27,11 @@ #include #include -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/utilities.h" +#include "world_builder/world.h" -#include +#include "app/main.h" using namespace WorldBuilder::Utilities; diff --git a/examples/C/example.c b/examples/C/example.c index 4f7d28358..000191d1c 100644 --- a/examples/C/example.c +++ b/examples/C/example.c @@ -1,5 +1,5 @@ -#include +#include "world_builder/wrapper_c.h" #include int main() { diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h index 62c7d8e55..d857baeea 100644 --- a/include/rapidjson/rapidjson.h +++ b/include/rapidjson/rapidjson.h @@ -402,7 +402,7 @@ RAPIDJSON_NAMESPACE_END \ref RAPIDJSON_ERRORS APIs. */ #ifndef RAPIDJSON_ASSERT -#include +#include "world_builder/assert.h" #define RAPIDJSON_ASSERT(x) WBAssertThrow(x, "RapidJSON error.") #endif // RAPIDJSON_ASSERT diff --git a/include/world_builder/coordinate_systems/cartesian.h b/include/world_builder/coordinate_systems/cartesian.h index 47c6d8383..c9aad261f 100644 --- a/include/world_builder/coordinate_systems/cartesian.h +++ b/include/world_builder/coordinate_systems/cartesian.h @@ -20,8 +20,8 @@ #ifndef _world_builder_coordinate_systems_cartesian_h #define _world_builder_coordinate_systems_cartesian_h -#include -#include +#include "world_builder/utilities.h" +#include "world_builder/coordinate_systems/interface.h" namespace WorldBuilder diff --git a/include/world_builder/coordinate_systems/interface.h b/include/world_builder/coordinate_systems/interface.h index 9a6bfd258..7bc8da614 100644 --- a/include/world_builder/coordinate_systems/interface.h +++ b/include/world_builder/coordinate_systems/interface.h @@ -20,11 +20,11 @@ #ifndef _world_builder_coordinate_systems_interface_h #define _world_builder_coordinate_systems_interface_h -#include -#include -#include -#include -#include +#include "world_builder/coordinate_system.h" +#include "world_builder/parameters.h" +#include "world_builder/utilities.h" +#include "world_builder/world.h" +#include "world_builder/types/string.h" namespace WorldBuilder diff --git a/include/world_builder/coordinate_systems/spherical.h b/include/world_builder/coordinate_systems/spherical.h index cd9e97d99..2ac5c2fb2 100644 --- a/include/world_builder/coordinate_systems/spherical.h +++ b/include/world_builder/coordinate_systems/spherical.h @@ -20,8 +20,8 @@ #ifndef _world_builder_coordinate_systems_spherical_h #define _world_builder_coordinate_systems_spherical_h -#include -#include +#include "world_builder/utilities.h" +#include "world_builder/coordinate_systems/interface.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate.h b/include/world_builder/features/continental_plate.h index fdbb1928e..961657310 100644 --- a/include/world_builder/features/continental_plate.h +++ b/include/world_builder/features/continental_plate.h @@ -20,12 +20,12 @@ #ifndef _world_feature_features_continental_plate_h #define _world_feature_features_continental_plate_h -#include -#include +#include "world_builder/features/interface.h" +#include "world_builder/world.h" -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/interface.h" +#include "world_builder/features/continental_plate_models/composition/interface.h" +#include "world_builder/features/continental_plate_models/grains/interface.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/composition/interface.h b/include/world_builder/features/continental_plate_models/composition/interface.h index 2a0c1bdfc..515691daf 100644 --- a/include/world_builder/features/continental_plate_models/composition/interface.h +++ b/include/world_builder/features/continental_plate_models/composition/interface.h @@ -24,9 +24,9 @@ #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/composition/uniform.h b/include/world_builder/features/continental_plate_models/composition/uniform.h index b3e719605..093d3b675 100644 --- a/include/world_builder/features/continental_plate_models/composition/uniform.h +++ b/include/world_builder/features/continental_plate_models/composition/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_continental_plate_composition_uniform_h #define _world_builder_features_continental_plate_composition_uniform_h -#include -#include +#include "world_builder/features/continental_plate_models/composition/interface.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/grains/interface.h b/include/world_builder/features/continental_plate_models/grains/interface.h index b907d98e7..bf9a4bec1 100644 --- a/include/world_builder/features/continental_plate_models/grains/interface.h +++ b/include/world_builder/features/continental_plate_models/grains/interface.h @@ -24,9 +24,9 @@ #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/grains/random_uniform_distribution.h b/include/world_builder/features/continental_plate_models/grains/random_uniform_distribution.h index d65387baf..957d5d29b 100644 --- a/include/world_builder/features/continental_plate_models/grains/random_uniform_distribution.h +++ b/include/world_builder/features/continental_plate_models/grains/random_uniform_distribution.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_continental_plate_grains_random_uniform_distribution_h #define _world_builder_features_continental_plate_grains_random_uniform_distribution_h -#include -#include +#include "world_builder/features/continental_plate_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/continental_plate_models/grains/uniform.h b/include/world_builder/features/continental_plate_models/grains/uniform.h index 581817f8b..c0b3b7ec2 100644 --- a/include/world_builder/features/continental_plate_models/grains/uniform.h +++ b/include/world_builder/features/continental_plate_models/grains/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_continental_plate_grains_uniform_h #define _world_builder_features_continental_plate_grains_uniform_h -#include -#include +#include "world_builder/features/continental_plate_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/continental_plate_models/temperature/adiabatic.h b/include/world_builder/features/continental_plate_models/temperature/adiabatic.h index 7e468f8c5..142c78b84 100644 --- a/include/world_builder/features/continental_plate_models/temperature/adiabatic.h +++ b/include/world_builder/features/continental_plate_models/temperature/adiabatic.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_continental_plate_temperature_adiabatic_h #define _world_builder_features_continental_plate_temperature_adiabatic_h -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/temperature/interface.h b/include/world_builder/features/continental_plate_models/temperature/interface.h index 7d8e7c496..101f44be7 100644 --- a/include/world_builder/features/continental_plate_models/temperature/interface.h +++ b/include/world_builder/features/continental_plate_models/temperature/interface.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/temperature/linear.h b/include/world_builder/features/continental_plate_models/temperature/linear.h index 1654382f8..39a7a02a6 100644 --- a/include/world_builder/features/continental_plate_models/temperature/linear.h +++ b/include/world_builder/features/continental_plate_models/temperature/linear.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_continental_plate_temperature_linear_h #define _world_builder_features_continental_plate_temperature_linear_h -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/continental_plate_models/temperature/uniform.h b/include/world_builder/features/continental_plate_models/temperature/uniform.h index c8f2f8de1..c30025b13 100644 --- a/include/world_builder/features/continental_plate_models/temperature/uniform.h +++ b/include/world_builder/features/continental_plate_models/temperature/uniform.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_continental_plate_temperature_uniform_h #define _world_builder_features_continental_plate_temperature_uniform_h -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/fault.h b/include/world_builder/features/fault.h index 13f114a42..e445589d4 100644 --- a/include/world_builder/features/fault.h +++ b/include/world_builder/features/fault.h @@ -20,13 +20,13 @@ #ifndef _world_feature_features_fault_h #define _world_feature_features_fault_h -#include -#include -#include +#include "world_builder/features/interface.h" +#include "world_builder/world.h" +#include "world_builder/types/segment.h" -#include -#include -#include +#include "world_builder/features/fault_models/temperature/interface.h" +#include "world_builder/features/fault_models/composition/interface.h" +#include "world_builder/features/fault_models/grains/interface.h" namespace WorldBuilder diff --git a/include/world_builder/features/fault_models/composition/interface.h b/include/world_builder/features/fault_models/composition/interface.h index b0852f676..99d469183 100644 --- a/include/world_builder/features/fault_models/composition/interface.h +++ b/include/world_builder/features/fault_models/composition/interface.h @@ -20,15 +20,14 @@ #ifndef _world_builder_features_fault_composition_interface_h #define _world_builder_features_fault_composition_interface_h +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" + #include #include -#include -#include -#include -#include - - namespace WorldBuilder { class World; diff --git a/include/world_builder/features/fault_models/composition/uniform.h b/include/world_builder/features/fault_models/composition/uniform.h index 1bcfcfd9f..fc7a3e2db 100644 --- a/include/world_builder/features/fault_models/composition/uniform.h +++ b/include/world_builder/features/fault_models/composition/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_fault_composition_uniform_h #define _world_builder_features_fault_composition_uniform_h -#include -#include +#include "world_builder/features/fault_models/composition/interface.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/fault_models/grains/interface.h b/include/world_builder/features/fault_models/grains/interface.h index 6146d6622..57a1598d5 100644 --- a/include/world_builder/features/fault_models/grains/interface.h +++ b/include/world_builder/features/fault_models/grains/interface.h @@ -20,15 +20,14 @@ #ifndef _world_builder_features_fault_grains_interface_h #define _world_builder_features_fault_grains_interface_h +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" + #include #include -#include -#include -#include -#include - - namespace WorldBuilder { class World; diff --git a/include/world_builder/features/fault_models/grains/random_uniform_distribution.h b/include/world_builder/features/fault_models/grains/random_uniform_distribution.h index 44d38bbb4..5b7b0c77e 100644 --- a/include/world_builder/features/fault_models/grains/random_uniform_distribution.h +++ b/include/world_builder/features/fault_models/grains/random_uniform_distribution.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_fault_grains_random_uniform_distribution_h #define _world_builder_features_fault_grains_random_uniform_distribution_h -#include -#include +#include "world_builder/features/fault_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/fault_models/grains/uniform.h b/include/world_builder/features/fault_models/grains/uniform.h index be4d31c18..e1c1072c9 100644 --- a/include/world_builder/features/fault_models/grains/uniform.h +++ b/include/world_builder/features/fault_models/grains/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_fault_grains_uniform_h #define _world_builder_features_fault_grains_uniform_h -#include -#include +#include "world_builder/features/fault_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/fault_models/temperature/adiabatic.h b/include/world_builder/features/fault_models/temperature/adiabatic.h index 5b460e084..1b806b8e9 100644 --- a/include/world_builder/features/fault_models/temperature/adiabatic.h +++ b/include/world_builder/features/fault_models/temperature/adiabatic.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_fault_temperature_adiabatic_h #define _world_builder_features_fault_temperature_adiabatic_h -#include -#include -#include +#include "world_builder/features/fault_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/fault_models/temperature/interface.h b/include/world_builder/features/fault_models/temperature/interface.h index 3a34c58bf..c970da1dc 100644 --- a/include/world_builder/features/fault_models/temperature/interface.h +++ b/include/world_builder/features/fault_models/temperature/interface.h @@ -20,15 +20,14 @@ #ifndef _world_builder_features_fault_temperature_interface_h #define _world_builder_features_fault_temperature_interface_h +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" + #include #include -#include -#include -#include -#include - - namespace WorldBuilder { class World; diff --git a/include/world_builder/features/fault_models/temperature/linear.h b/include/world_builder/features/fault_models/temperature/linear.h index 9649ce01c..4530ab4a1 100644 --- a/include/world_builder/features/fault_models/temperature/linear.h +++ b/include/world_builder/features/fault_models/temperature/linear.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_fault_temperature_linear_h #define _world_builder_features_fault_temperature_linear_h -#include -#include -#include +#include "world_builder/features/fault_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/fault_models/temperature/uniform.h b/include/world_builder/features/fault_models/temperature/uniform.h index 0ac95cce6..5a6288f6d 100644 --- a/include/world_builder/features/fault_models/temperature/uniform.h +++ b/include/world_builder/features/fault_models/temperature/uniform.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_fault_temperature_uniform_h #define _world_builder_features_fault_temperature_uniform_h -#include -#include -#include +#include "world_builder/features/fault_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/interface.h b/include/world_builder/features/interface.h index f47e91fe0..90f70b380 100644 --- a/include/world_builder/features/interface.h +++ b/include/world_builder/features/interface.h @@ -23,10 +23,10 @@ #include #include -#include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" namespace WorldBuilder { diff --git a/include/world_builder/features/mantle_layer.h b/include/world_builder/features/mantle_layer.h index 4a6556914..4cd514e12 100644 --- a/include/world_builder/features/mantle_layer.h +++ b/include/world_builder/features/mantle_layer.h @@ -20,12 +20,12 @@ #ifndef _world_feature_features_mantle_layer_h #define _world_feature_features_mantle_layer_h -#include -#include +#include "world_builder/features/interface.h" +#include "world_builder/world.h" -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/interface.h" +#include "world_builder/features/mantle_layer_models/composition/interface.h" +#include "world_builder/features/mantle_layer_models/grains/interface.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/composition/interface.h b/include/world_builder/features/mantle_layer_models/composition/interface.h index 16614bff2..24319a0bc 100644 --- a/include/world_builder/features/mantle_layer_models/composition/interface.h +++ b/include/world_builder/features/mantle_layer_models/composition/interface.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/composition/uniform.h b/include/world_builder/features/mantle_layer_models/composition/uniform.h index b503025a3..6722b66f8 100644 --- a/include/world_builder/features/mantle_layer_models/composition/uniform.h +++ b/include/world_builder/features/mantle_layer_models/composition/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_mantle_layer_composition_uniform_h #define _world_builder_features_mantle_layer_composition_uniform_h -#include -#include +#include "world_builder/features/mantle_layer_models/composition/interface.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/grains/interface.h b/include/world_builder/features/mantle_layer_models/grains/interface.h index 5326c6555..9454a68cc 100644 --- a/include/world_builder/features/mantle_layer_models/grains/interface.h +++ b/include/world_builder/features/mantle_layer_models/grains/interface.h @@ -24,9 +24,9 @@ #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h b/include/world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h index e8cbddd8e..f3b80895c 100644 --- a/include/world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h +++ b/include/world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_mantle_layer_grains_random_uniform_distribution_h #define _world_builder_features_mantle_layer_grains_random_uniform_distribution_h -#include -#include +#include "world_builder/features/mantle_layer_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/mantle_layer_models/grains/uniform.h b/include/world_builder/features/mantle_layer_models/grains/uniform.h index e9056e1d7..b8d1477a1 100644 --- a/include/world_builder/features/mantle_layer_models/grains/uniform.h +++ b/include/world_builder/features/mantle_layer_models/grains/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_mantle_layer_grains_uniform_h #define _world_builder_features_mantle_layer_grains_uniform_h -#include -#include +#include "world_builder/features/mantle_layer_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/mantle_layer_models/temperature/adiabatic.h b/include/world_builder/features/mantle_layer_models/temperature/adiabatic.h index a003fe9e6..605acd9c7 100644 --- a/include/world_builder/features/mantle_layer_models/temperature/adiabatic.h +++ b/include/world_builder/features/mantle_layer_models/temperature/adiabatic.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_mantle_layer_temperature_adiabatic_h #define _world_builder_features_mantle_layer_temperature_adiabatic_h -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/temperature/interface.h b/include/world_builder/features/mantle_layer_models/temperature/interface.h index 13671db0a..877a8ce30 100644 --- a/include/world_builder/features/mantle_layer_models/temperature/interface.h +++ b/include/world_builder/features/mantle_layer_models/temperature/interface.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/temperature/linear.h b/include/world_builder/features/mantle_layer_models/temperature/linear.h index 5d136140b..83434d1c9 100644 --- a/include/world_builder/features/mantle_layer_models/temperature/linear.h +++ b/include/world_builder/features/mantle_layer_models/temperature/linear.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_mantle_layer_temperature_linear_h #define _world_builder_features_mantle_layer_temperature_linear_h -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/mantle_layer_models/temperature/uniform.h b/include/world_builder/features/mantle_layer_models/temperature/uniform.h index 402fbc4b2..cbf1eef65 100644 --- a/include/world_builder/features/mantle_layer_models/temperature/uniform.h +++ b/include/world_builder/features/mantle_layer_models/temperature/uniform.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_mantle_layer_temperature_uniform_h #define _world_builder_features_mantle_layer_temperature_uniform_h -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate.h b/include/world_builder/features/oceanic_plate.h index b2b937bf3..dfdc656a1 100644 --- a/include/world_builder/features/oceanic_plate.h +++ b/include/world_builder/features/oceanic_plate.h @@ -20,11 +20,11 @@ #ifndef _world_feature_features_oceanic_plate_h #define _world_feature_features_oceanic_plate_h -#include -#include -#include -#include -#include +#include "world_builder/features/interface.h" +#include "world_builder/world.h" +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" +#include "world_builder/features/oceanic_plate_models/composition/interface.h" +#include "world_builder/features/oceanic_plate_models/grains/interface.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/composition/interface.h b/include/world_builder/features/oceanic_plate_models/composition/interface.h index 86f829c31..f22813035 100644 --- a/include/world_builder/features/oceanic_plate_models/composition/interface.h +++ b/include/world_builder/features/oceanic_plate_models/composition/interface.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/composition/uniform.h b/include/world_builder/features/oceanic_plate_models/composition/uniform.h index 6f412ffe7..0396283b8 100644 --- a/include/world_builder/features/oceanic_plate_models/composition/uniform.h +++ b/include/world_builder/features/oceanic_plate_models/composition/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_oceanic_plate_composition_uniform_h #define _world_builder_features_oceanic_plate_composition_uniform_h -#include -#include +#include "world_builder/features/oceanic_plate_models/composition/interface.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/grains/interface.h b/include/world_builder/features/oceanic_plate_models/grains/interface.h index f4b716566..2c9a194c2 100644 --- a/include/world_builder/features/oceanic_plate_models/grains/interface.h +++ b/include/world_builder/features/oceanic_plate_models/grains/interface.h @@ -24,9 +24,9 @@ #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h b/include/world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h index fe95f67f3..10ed109bd 100644 --- a/include/world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h +++ b/include/world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_oceanic_plate_grains_random_uniform_distribution_h #define _world_builder_features_oceanic_plate_grains_random_uniform_distribution_h -#include -#include +#include "world_builder/features/oceanic_plate_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/oceanic_plate_models/grains/uniform.h b/include/world_builder/features/oceanic_plate_models/grains/uniform.h index d83df47f6..f0f47e146 100644 --- a/include/world_builder/features/oceanic_plate_models/grains/uniform.h +++ b/include/world_builder/features/oceanic_plate_models/grains/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_oceanic_plate_grains_uniform_h #define _world_builder_features_oceanic_plate_grains_uniform_h -#include -#include +#include "world_builder/features/oceanic_plate_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/oceanic_plate_models/temperature/adiabatic.h b/include/world_builder/features/oceanic_plate_models/temperature/adiabatic.h index a9c1f42b9..0aebcb754 100644 --- a/include/world_builder/features/oceanic_plate_models/temperature/adiabatic.h +++ b/include/world_builder/features/oceanic_plate_models/temperature/adiabatic.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_oceanic_plate_temperature_adiabatic_h #define _world_builder_features_oceanic_plate_temperature_adiabatic_h -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/temperature/interface.h b/include/world_builder/features/oceanic_plate_models/temperature/interface.h index 3252d184e..3019ad4f2 100644 --- a/include/world_builder/features/oceanic_plate_models/temperature/interface.h +++ b/include/world_builder/features/oceanic_plate_models/temperature/interface.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/temperature/linear.h b/include/world_builder/features/oceanic_plate_models/temperature/linear.h index 5ad4759f0..ef4b2003d 100644 --- a/include/world_builder/features/oceanic_plate_models/temperature/linear.h +++ b/include/world_builder/features/oceanic_plate_models/temperature/linear.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_oceanic_plate_temperature_linear_h #define _world_builder_features_oceanic_plate_temperature_linear_h -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/temperature/plate_model.h b/include/world_builder/features/oceanic_plate_models/temperature/plate_model.h index 7fffd0751..cebcc3a94 100644 --- a/include/world_builder/features/oceanic_plate_models/temperature/plate_model.h +++ b/include/world_builder/features/oceanic_plate_models/temperature/plate_model.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_oceanic_plate_temperature_plate_model_h #define _world_builder_features_oceanic_plate_temperature_plate_model_h -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/oceanic_plate_models/temperature/uniform.h b/include/world_builder/features/oceanic_plate_models/temperature/uniform.h index 3a3b777d3..b1aa0db8f 100644 --- a/include/world_builder/features/oceanic_plate_models/temperature/uniform.h +++ b/include/world_builder/features/oceanic_plate_models/temperature/uniform.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_oceanic_plate_temperature_uniform_h #define _world_builder_features_oceanic_plate_temperature_uniform_h -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/subducting_plate.h b/include/world_builder/features/subducting_plate.h index a5c6ffdd2..966e5d1bb 100644 --- a/include/world_builder/features/subducting_plate.h +++ b/include/world_builder/features/subducting_plate.h @@ -20,13 +20,13 @@ #ifndef _world_feature_features_subducting_plate_h #define _world_feature_features_subducting_plate_h -#include -#include -#include +#include "world_builder/features/interface.h" +#include "world_builder/world.h" +#include "world_builder/types/segment.h" -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/interface.h" +#include "world_builder/features/subducting_plate_models/composition/interface.h" +#include "world_builder/features/subducting_plate_models/grains/interface.h" namespace WorldBuilder diff --git a/include/world_builder/features/subducting_plate_models/composition/interface.h b/include/world_builder/features/subducting_plate_models/composition/interface.h index c28a2e012..ce8707dba 100644 --- a/include/world_builder/features/subducting_plate_models/composition/interface.h +++ b/include/world_builder/features/subducting_plate_models/composition/interface.h @@ -20,15 +20,14 @@ #ifndef _world_builder_features_subducting_plate_composition_interface_h #define _world_builder_features_subducting_plate_composition_interface_h +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" + #include #include -#include -#include -#include -#include - - namespace WorldBuilder { class World; diff --git a/include/world_builder/features/subducting_plate_models/composition/uniform.h b/include/world_builder/features/subducting_plate_models/composition/uniform.h index 586b5a9e0..6aac2af80 100644 --- a/include/world_builder/features/subducting_plate_models/composition/uniform.h +++ b/include/world_builder/features/subducting_plate_models/composition/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_subducting_plate_composition_uniform_h #define _world_builder_features_subducting_plate_composition_uniform_h -#include -#include +#include "world_builder/features/subducting_plate_models/composition/interface.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/subducting_plate_models/grains/interface.h b/include/world_builder/features/subducting_plate_models/grains/interface.h index e4fccbfad..731e26f44 100644 --- a/include/world_builder/features/subducting_plate_models/grains/interface.h +++ b/include/world_builder/features/subducting_plate_models/grains/interface.h @@ -20,15 +20,14 @@ #ifndef _world_builder_features_subducting_plate_grains_interface_h #define _world_builder_features_subducting_plate_grains_interface_h +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" + #include #include -#include -#include -#include -#include - - namespace WorldBuilder { class World; diff --git a/include/world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h b/include/world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h index 49afab77b..56488c4d9 100644 --- a/include/world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h +++ b/include/world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_subducting_plate_grains_random_uniform_distribution_h #define _world_builder_features_subducting_plate_grains_random_uniform_distribution_h -#include -#include +#include "world_builder/features/subducting_plate_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/subducting_plate_models/grains/uniform.h b/include/world_builder/features/subducting_plate_models/grains/uniform.h index 1078ba437..64ea0bd13 100644 --- a/include/world_builder/features/subducting_plate_models/grains/uniform.h +++ b/include/world_builder/features/subducting_plate_models/grains/uniform.h @@ -20,8 +20,8 @@ #ifndef _world_builder_features_subducting_plate_grains_uniform_h #define _world_builder_features_subducting_plate_grains_uniform_h -#include -#include +#include "world_builder/features/subducting_plate_models/grains/interface.h" +#include "world_builder/world.h" namespace WorldBuilder { diff --git a/include/world_builder/features/subducting_plate_models/temperature/adiabatic.h b/include/world_builder/features/subducting_plate_models/temperature/adiabatic.h index 2f60c1cfa..146cf2c84 100644 --- a/include/world_builder/features/subducting_plate_models/temperature/adiabatic.h +++ b/include/world_builder/features/subducting_plate_models/temperature/adiabatic.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_subducting_plate_temperature_adiabatic_h #define _world_builder_features_subducting_plate_temperature_adiabatic_h -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/subducting_plate_models/temperature/interface.h b/include/world_builder/features/subducting_plate_models/temperature/interface.h index f46eb8a8b..191223cea 100644 --- a/include/world_builder/features/subducting_plate_models/temperature/interface.h +++ b/include/world_builder/features/subducting_plate_models/temperature/interface.h @@ -20,15 +20,14 @@ #ifndef _world_builder_features_subducting_plate_temperature_interface_h #define _world_builder_features_subducting_plate_temperature_interface_h +#include "world_builder/world.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/utilities.h" + #include #include -#include -#include -#include -#include - - namespace WorldBuilder { class World; diff --git a/include/world_builder/features/subducting_plate_models/temperature/linear.h b/include/world_builder/features/subducting_plate_models/temperature/linear.h index 842ee26b6..765051896 100644 --- a/include/world_builder/features/subducting_plate_models/temperature/linear.h +++ b/include/world_builder/features/subducting_plate_models/temperature/linear.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_subducting_plate_temperature_linear_h #define _world_builder_features_subducting_plate_temperature_linear_h -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/subducting_plate_models/temperature/plate_model.h b/include/world_builder/features/subducting_plate_models/temperature/plate_model.h index 0d2110975..4834a25fc 100644 --- a/include/world_builder/features/subducting_plate_models/temperature/plate_model.h +++ b/include/world_builder/features/subducting_plate_models/temperature/plate_model.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_subducting_plate_temperature_plate_model_h #define _world_builder_features_subducting_plate_temperature_plate_model_h -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/subducting_plate_models/temperature/uniform.h b/include/world_builder/features/subducting_plate_models/temperature/uniform.h index 8eab4609a..792c780a1 100644 --- a/include/world_builder/features/subducting_plate_models/temperature/uniform.h +++ b/include/world_builder/features/subducting_plate_models/temperature/uniform.h @@ -20,9 +20,9 @@ #ifndef _world_builder_features_subducting_plate_temperature_uniform_h #define _world_builder_features_subducting_plate_temperature_uniform_h -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/interface.h" +#include "world_builder/features/utilities.h" +#include "world_builder/world.h" namespace WorldBuilder diff --git a/include/world_builder/features/utilities.h b/include/world_builder/features/utilities.h index 87acad8c4..54f676e3f 100644 --- a/include/world_builder/features/utilities.h +++ b/include/world_builder/features/utilities.h @@ -24,7 +24,7 @@ #include #include -#include +#include "world_builder/assert.h" namespace WorldBuilder { diff --git a/include/world_builder/parameters.h b/include/world_builder/parameters.h index 0657e119f..51bf0857b 100644 --- a/include/world_builder/parameters.h +++ b/include/world_builder/parameters.h @@ -30,7 +30,7 @@ #include #include "rapidjson/schema.h" -#include +#include "world_builder/point.h" namespace WorldBuilder { diff --git a/include/world_builder/point.h b/include/world_builder/point.h index 7d8c69494..b0b927487 100644 --- a/include/world_builder/point.h +++ b/include/world_builder/point.h @@ -24,8 +24,8 @@ #include #include -#include -#include +#include "world_builder/coordinate_system.h" +#include "world_builder/assert.h" namespace WorldBuilder { diff --git a/include/world_builder/types/array.h b/include/world_builder/types/array.h index 86fa410dd..f1d34576f 100644 --- a/include/world_builder/types/array.h +++ b/include/world_builder/types/array.h @@ -20,7 +20,7 @@ #ifndef _world_feature_types_array_h #define _world_feature_types_array_h -#include +#include "world_builder/types/interface.h" namespace WorldBuilder diff --git a/include/world_builder/types/bool.h b/include/world_builder/types/bool.h index eb3a478c1..346d9241f 100644 --- a/include/world_builder/types/bool.h +++ b/include/world_builder/types/bool.h @@ -20,7 +20,7 @@ #ifndef _world_feature_types_bool_h #define _world_feature_types_bool_h -#include +#include "world_builder/types/interface.h" namespace WorldBuilder diff --git a/include/world_builder/types/double.h b/include/world_builder/types/double.h index edc5c2c6a..9a0aa0bc5 100644 --- a/include/world_builder/types/double.h +++ b/include/world_builder/types/double.h @@ -20,7 +20,7 @@ #ifndef _world_feature_types_double_h #define _world_feature_types_double_h -#include +#include "world_builder/types/interface.h" namespace WorldBuilder diff --git a/include/world_builder/types/object.h b/include/world_builder/types/object.h index 2b22a05e2..f52bdaa2f 100644 --- a/include/world_builder/types/object.h +++ b/include/world_builder/types/object.h @@ -20,7 +20,7 @@ #ifndef _world_feature_types_object_h #define _world_feature_types_object_h -#include +#include "world_builder/types/interface.h" namespace WorldBuilder diff --git a/include/world_builder/types/plugin_system.h b/include/world_builder/types/plugin_system.h index 5bd443ddb..7ce546160 100644 --- a/include/world_builder/types/plugin_system.h +++ b/include/world_builder/types/plugin_system.h @@ -20,8 +20,8 @@ #ifndef _world_feature_types_plugin_system_h #define _world_feature_types_plugin_system_h -#include -#include +#include "world_builder/types/interface.h" +#include "world_builder/features/interface.h" namespace WorldBuilder diff --git a/include/world_builder/types/point.h b/include/world_builder/types/point.h index e2aa076f7..0f60a4f9e 100644 --- a/include/world_builder/types/point.h +++ b/include/world_builder/types/point.h @@ -20,8 +20,8 @@ #ifndef _world_feature_types_point_h #define _world_feature_types_point_h -#include -#include +#include "world_builder/types/interface.h" +#include "world_builder/point.h" namespace WorldBuilder diff --git a/include/world_builder/types/segment.h b/include/world_builder/types/segment.h index d13df67d1..a14087f90 100644 --- a/include/world_builder/types/segment.h +++ b/include/world_builder/types/segment.h @@ -20,9 +20,9 @@ #ifndef _world_feature_types_segment_h #define _world_feature_types_segment_h -#include -#include -#include +#include "world_builder/types/interface.h" +#include "world_builder/point.h" +#include "world_builder/types/plugin_system.h" namespace WorldBuilder diff --git a/include/world_builder/types/string.h b/include/world_builder/types/string.h index e4865408c..626126c63 100644 --- a/include/world_builder/types/string.h +++ b/include/world_builder/types/string.h @@ -20,7 +20,7 @@ #ifndef _world_feature_types_string_h #define _world_feature_types_string_h -#include +#include "world_builder/types/interface.h" namespace WorldBuilder diff --git a/include/world_builder/types/unsigned_int.h b/include/world_builder/types/unsigned_int.h index 3e2cecf41..2acf4e332 100644 --- a/include/world_builder/types/unsigned_int.h +++ b/include/world_builder/types/unsigned_int.h @@ -20,7 +20,7 @@ #ifndef _world_feature_types_unsigned_int_h #define _world_feature_types_unsigned_int_h -#include +#include "world_builder/types/interface.h" namespace WorldBuilder diff --git a/include/world_builder/utilities.h b/include/world_builder/utilities.h index ad439263d..75e8e6ad7 100644 --- a/include/world_builder/utilities.h +++ b/include/world_builder/utilities.h @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include "world_builder/point.h" +#include "world_builder/coordinate_system.h" +#include "world_builder/coordinate_systems/interface.h" namespace WorldBuilder diff --git a/include/world_builder/world.h b/include/world_builder/world.h index df2617cda..507ed3e8f 100644 --- a/include/world_builder/world.h +++ b/include/world_builder/world.h @@ -22,8 +22,8 @@ #include -#include -#include +#include "world_builder/parameters.h" +#include "world_builder/grains.h" diff --git a/source/coordinate_systems/cartesian.cc b/source/coordinate_systems/cartesian.cc index f5b81dbaa..81c28df6a 100644 --- a/source/coordinate_systems/cartesian.cc +++ b/source/coordinate_systems/cartesian.cc @@ -17,9 +17,9 @@ along with this program. If not, see . */ -#include +#include "world_builder/coordinate_systems/cartesian.h" -#include +#include "world_builder/assert.h" namespace WorldBuilder { diff --git a/source/coordinate_systems/interface.cc b/source/coordinate_systems/interface.cc index 1be0abd73..5d4ac79de 100644 --- a/source/coordinate_systems/interface.cc +++ b/source/coordinate_systems/interface.cc @@ -17,10 +17,10 @@ along with this program. If not, see . */ -#include +#include "world_builder/coordinate_systems/interface.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" #include diff --git a/source/coordinate_systems/spherical.cc b/source/coordinate_systems/spherical.cc index b7a8967cc..63e21b5a6 100644 --- a/source/coordinate_systems/spherical.cc +++ b/source/coordinate_systems/spherical.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/coordinate_systems/spherical.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" namespace WorldBuilder { diff --git a/source/features/continental_plate.cc b/source/features/continental_plate.cc index 229d61921..0fa7719d5 100644 --- a/source/features/continental_plate.cc +++ b/source/features/continental_plate.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/continental_plate_models/composition/interface.cc b/source/features/continental_plate_models/composition/interface.cc index 8fb68ac69..6dde50a7d 100644 --- a/source/features/continental_plate_models/composition/interface.cc +++ b/source/features/continental_plate_models/composition/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/continental_plate_models/composition/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/continental_plate_models/composition/uniform.cc b/source/features/continental_plate_models/composition/uniform.cc index b9426f944..035780cc4 100644 --- a/source/features/continental_plate_models/composition/uniform.cc +++ b/source/features/continental_plate_models/composition/uniform.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate_models/composition/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/continental_plate_models/grains/interface.cc b/source/features/continental_plate_models/grains/interface.cc index 6b0315b51..3c1b9d5ca 100644 --- a/source/features/continental_plate_models/grains/interface.cc +++ b/source/features/continental_plate_models/grains/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/continental_plate_models/grains/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/continental_plate_models/grains/random_uniform_distribution.cc b/source/features/continental_plate_models/grains/random_uniform_distribution.cc index 0ae6b3382..35cc06d9d 100644 --- a/source/features/continental_plate_models/grains/random_uniform_distribution.cc +++ b/source/features/continental_plate_models/grains/random_uniform_distribution.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate_models/grains/random_uniform_distribution.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/continental_plate_models/grains/uniform.cc b/source/features/continental_plate_models/grains/uniform.cc index f4c04a25d..de2f04dab 100644 --- a/source/features/continental_plate_models/grains/uniform.cc +++ b/source/features/continental_plate_models/grains/uniform.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate_models/grains/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/continental_plate_models/temperature/adiabatic.cc b/source/features/continental_plate_models/temperature/adiabatic.cc index 246bd53e2..f9f43e895 100644 --- a/source/features/continental_plate_models/temperature/adiabatic.cc +++ b/source/features/continental_plate_models/temperature/adiabatic.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/adiabatic.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/continental_plate_models/temperature/interface.cc b/source/features/continental_plate_models/temperature/interface.cc index 5e8454197..4448a6628 100644 --- a/source/features/continental_plate_models/temperature/interface.cc +++ b/source/features/continental_plate_models/temperature/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/continental_plate_models/temperature/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/continental_plate_models/temperature/linear.cc b/source/features/continental_plate_models/temperature/linear.cc index ce2840325..b2f62100d 100644 --- a/source/features/continental_plate_models/temperature/linear.cc +++ b/source/features/continental_plate_models/temperature/linear.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/linear.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/continental_plate_models/temperature/uniform.cc b/source/features/continental_plate_models/temperature/uniform.cc index 70984d05b..f99393d2e 100644 --- a/source/features/continental_plate_models/temperature/uniform.cc +++ b/source/features/continental_plate_models/temperature/uniform.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/continental_plate_models/temperature/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/fault.cc b/source/features/fault.cc index f34b0bd81..39dd63763 100644 --- a/source/features/fault.cc +++ b/source/features/fault.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/point.h" +#include "world_builder/types/segment.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include "rapidjson/prettywriter.h" #include "rapidjson/stringbuffer.h" diff --git a/source/features/fault_models/composition/interface.cc b/source/features/fault_models/composition/interface.cc index a13564680..3d65e73cb 100644 --- a/source/features/fault_models/composition/interface.cc +++ b/source/features/fault_models/composition/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/fault_models/composition/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/fault_models/composition/uniform.cc b/source/features/fault_models/composition/uniform.cc index c177dbb57..a0512d64c 100644 --- a/source/features/fault_models/composition/uniform.cc +++ b/source/features/fault_models/composition/uniform.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault_models/composition/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/fault_models/grains/interface.cc b/source/features/fault_models/grains/interface.cc index 97b034295..95b7bc070 100644 --- a/source/features/fault_models/grains/interface.cc +++ b/source/features/fault_models/grains/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/fault_models/grains/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/fault_models/grains/random_uniform_distribution.cc b/source/features/fault_models/grains/random_uniform_distribution.cc index e00791b4a..2f2f18a78 100644 --- a/source/features/fault_models/grains/random_uniform_distribution.cc +++ b/source/features/fault_models/grains/random_uniform_distribution.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault_models/grains/random_uniform_distribution.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/fault_models/grains/uniform.cc b/source/features/fault_models/grains/uniform.cc index 117647cd0..4ede1f9c7 100644 --- a/source/features/fault_models/grains/uniform.cc +++ b/source/features/fault_models/grains/uniform.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault_models/grains/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/fault_models/grains/uniform.cc_backup b/source/features/fault_models/grains/uniform.cc_backup index f008494de..acc9ef824 100644 --- a/source/features/fault_models/grains/uniform.cc_backup +++ b/source/features/fault_models/grains/uniform.cc_backup @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include +#include "world_builder/utilities.h" +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" + +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/string.h" +#include "world_builder/types/object.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/features/fault_models/grains/uniform.h" namespace WorldBuilder diff --git a/source/features/fault_models/temperature/adiabatic.cc b/source/features/fault_models/temperature/adiabatic.cc index 109063695..27ca8ae54 100644 --- a/source/features/fault_models/temperature/adiabatic.cc +++ b/source/features/fault_models/temperature/adiabatic.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault_models/temperature/adiabatic.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/fault_models/temperature/interface.cc b/source/features/fault_models/temperature/interface.cc index f9b438bca..2d3711c3f 100644 --- a/source/features/fault_models/temperature/interface.cc +++ b/source/features/fault_models/temperature/interface.cc @@ -18,11 +18,11 @@ */ -#include +#include "world_builder/features/fault_models/temperature/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include namespace WorldBuilder diff --git a/source/features/fault_models/temperature/linear.cc b/source/features/fault_models/temperature/linear.cc index 1e4060ca1..e97485096 100644 --- a/source/features/fault_models/temperature/linear.cc +++ b/source/features/fault_models/temperature/linear.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault_models/temperature/linear.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/fault_models/temperature/uniform.cc b/source/features/fault_models/temperature/uniform.cc index c5cd9a7ec..28d2d1cb8 100644 --- a/source/features/fault_models/temperature/uniform.cc +++ b/source/features/fault_models/temperature/uniform.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/fault_models/temperature/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/interface.cc b/source/features/interface.cc index 93123de06..8135416e0 100644 --- a/source/features/interface.cc +++ b/source/features/interface.cc @@ -17,14 +17,14 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include +#include "world_builder/features/interface.h" + +#include "world_builder/assert.h" +#include "world_builder/types/array.h" +#include "world_builder/types/object.h" +#include "world_builder/types/point.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/mantle_layer.cc b/source/features/mantle_layer.cc index a612a5790..f9e32046c 100644 --- a/source/features/mantle_layer.cc +++ b/source/features/mantle_layer.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/mantle_layer_models/composition/interface.cc b/source/features/mantle_layer_models/composition/interface.cc index 9ef2a8e3a..c77d440fb 100644 --- a/source/features/mantle_layer_models/composition/interface.cc +++ b/source/features/mantle_layer_models/composition/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/mantle_layer_models/composition/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/mantle_layer_models/composition/uniform.cc b/source/features/mantle_layer_models/composition/uniform.cc index 036e259f6..723425e0a 100644 --- a/source/features/mantle_layer_models/composition/uniform.cc +++ b/source/features/mantle_layer_models/composition/uniform.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer_models/composition/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/mantle_layer_models/grains/interface.cc b/source/features/mantle_layer_models/grains/interface.cc index f31bf86ca..2de5881f4 100644 --- a/source/features/mantle_layer_models/grains/interface.cc +++ b/source/features/mantle_layer_models/grains/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/mantle_layer_models/grains/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/mantle_layer_models/grains/random_uniform_distribution.cc b/source/features/mantle_layer_models/grains/random_uniform_distribution.cc index 5e8e9420d..2ecfa1575 100644 --- a/source/features/mantle_layer_models/grains/random_uniform_distribution.cc +++ b/source/features/mantle_layer_models/grains/random_uniform_distribution.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer_models/grains/random_uniform_distribution.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/mantle_layer_models/grains/uniform.cc b/source/features/mantle_layer_models/grains/uniform.cc index 200c38986..91f068df6 100644 --- a/source/features/mantle_layer_models/grains/uniform.cc +++ b/source/features/mantle_layer_models/grains/uniform.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer_models/grains/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/mantle_layer_models/temperature/adiabatic.cc b/source/features/mantle_layer_models/temperature/adiabatic.cc index 61423eb0f..30e1e9eec 100644 --- a/source/features/mantle_layer_models/temperature/adiabatic.cc +++ b/source/features/mantle_layer_models/temperature/adiabatic.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/adiabatic.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/mantle_layer_models/temperature/interface.cc b/source/features/mantle_layer_models/temperature/interface.cc index 30cc92c2e..f451e376d 100644 --- a/source/features/mantle_layer_models/temperature/interface.cc +++ b/source/features/mantle_layer_models/temperature/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/mantle_layer_models/temperature/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/mantle_layer_models/temperature/linear.cc b/source/features/mantle_layer_models/temperature/linear.cc index 141321250..1da888026 100644 --- a/source/features/mantle_layer_models/temperature/linear.cc +++ b/source/features/mantle_layer_models/temperature/linear.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/linear.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/mantle_layer_models/temperature/uniform.cc b/source/features/mantle_layer_models/temperature/uniform.cc index 24c44e43e..cced7334a 100644 --- a/source/features/mantle_layer_models/temperature/uniform.cc +++ b/source/features/mantle_layer_models/temperature/uniform.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/mantle_layer_models/temperature/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate.cc b/source/features/oceanic_plate.cc index 0352cb2d1..7f4dda827 100644 --- a/source/features/oceanic_plate.cc +++ b/source/features/oceanic_plate.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/point.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate_models/composition/interface.cc b/source/features/oceanic_plate_models/composition/interface.cc index 03605bd74..9e81cf6f3 100644 --- a/source/features/oceanic_plate_models/composition/interface.cc +++ b/source/features/oceanic_plate_models/composition/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/oceanic_plate_models/composition/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/oceanic_plate_models/composition/uniform.cc b/source/features/oceanic_plate_models/composition/uniform.cc index aab9aa236..c5ea60840 100644 --- a/source/features/oceanic_plate_models/composition/uniform.cc +++ b/source/features/oceanic_plate_models/composition/uniform.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/composition/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate_models/grains/interface.cc b/source/features/oceanic_plate_models/grains/interface.cc index f6c6373a9..7092d7965 100644 --- a/source/features/oceanic_plate_models/grains/interface.cc +++ b/source/features/oceanic_plate_models/grains/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/oceanic_plate_models/grains/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc b/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc index a783d29d4..01cf562a3 100644 --- a/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc +++ b/source/features/oceanic_plate_models/grains/random_uniform_distribution.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/grains/random_uniform_distribution.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/oceanic_plate_models/grains/uniform.cc b/source/features/oceanic_plate_models/grains/uniform.cc index 73041315d..017569ff1 100644 --- a/source/features/oceanic_plate_models/grains/uniform.cc +++ b/source/features/oceanic_plate_models/grains/uniform.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/grains/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate_models/temperature/adiabatic.cc b/source/features/oceanic_plate_models/temperature/adiabatic.cc index 353542094..08fd0c482 100644 --- a/source/features/oceanic_plate_models/temperature/adiabatic.cc +++ b/source/features/oceanic_plate_models/temperature/adiabatic.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/adiabatic.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate_models/temperature/interface.cc b/source/features/oceanic_plate_models/temperature/interface.cc index 6626f965b..10e406718 100644 --- a/source/features/oceanic_plate_models/temperature/interface.cc +++ b/source/features/oceanic_plate_models/temperature/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/oceanic_plate_models/temperature/linear.cc b/source/features/oceanic_plate_models/temperature/linear.cc index 9cf0cc2ec..d89fadc83 100644 --- a/source/features/oceanic_plate_models/temperature/linear.cc +++ b/source/features/oceanic_plate_models/temperature/linear.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/linear.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate_models/temperature/plate_model.cc b/source/features/oceanic_plate_models/temperature/plate_model.cc index 3745cb6a9..e7ed6e2fc 100644 --- a/source/features/oceanic_plate_models/temperature/plate_model.cc +++ b/source/features/oceanic_plate_models/temperature/plate_model.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/plate_model.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/point.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/oceanic_plate_models/temperature/uniform.cc b/source/features/oceanic_plate_models/temperature/uniform.cc index a54e9f736..e8a98b455 100644 --- a/source/features/oceanic_plate_models/temperature/uniform.cc +++ b/source/features/oceanic_plate_models/temperature/uniform.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/oceanic_plate_models/temperature/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/subducting_plate.cc b/source/features/subducting_plate.cc index fde01ac81..7d9fb50cb 100644 --- a/source/features/subducting_plate.cc +++ b/source/features/subducting_plate.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/point.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include "glm/glm.h" diff --git a/source/features/subducting_plate_models/composition/interface.cc b/source/features/subducting_plate_models/composition/interface.cc index 2607943c0..64c0ca5c2 100644 --- a/source/features/subducting_plate_models/composition/interface.cc +++ b/source/features/subducting_plate_models/composition/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/subducting_plate_models/composition/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/subducting_plate_models/composition/uniform.cc b/source/features/subducting_plate_models/composition/uniform.cc index 25ab7f3ff..3773d03c7 100644 --- a/source/features/subducting_plate_models/composition/uniform.cc +++ b/source/features/subducting_plate_models/composition/uniform.cc @@ -17,17 +17,17 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/composition/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/subducting_plate_models/grains/interface.cc b/source/features/subducting_plate_models/grains/interface.cc index 4541637f8..e8e42f110 100644 --- a/source/features/subducting_plate_models/grains/interface.cc +++ b/source/features/subducting_plate_models/grains/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/subducting_plate_models/grains/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/subducting_plate_models/grains/random_uniform_distribution.cc b/source/features/subducting_plate_models/grains/random_uniform_distribution.cc index 4e6f99bfc..d04e0ddea 100644 --- a/source/features/subducting_plate_models/grains/random_uniform_distribution.cc +++ b/source/features/subducting_plate_models/grains/random_uniform_distribution.cc @@ -17,19 +17,19 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/grains/random_uniform_distribution.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" #include diff --git a/source/features/subducting_plate_models/grains/uniform.cc b/source/features/subducting_plate_models/grains/uniform.cc index 7f1a4b832..8567c29af 100644 --- a/source/features/subducting_plate_models/grains/uniform.cc +++ b/source/features/subducting_plate_models/grains/uniform.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/grains/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/subducting_plate_models/temperature/adiabatic.cc b/source/features/subducting_plate_models/temperature/adiabatic.cc index 25d2af195..3f2cf0a2c 100644 --- a/source/features/subducting_plate_models/temperature/adiabatic.cc +++ b/source/features/subducting_plate_models/temperature/adiabatic.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/adiabatic.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/subducting_plate_models/temperature/interface.cc b/source/features/subducting_plate_models/temperature/interface.cc index 58a5ae1dc..f1534db1c 100644 --- a/source/features/subducting_plate_models/temperature/interface.cc +++ b/source/features/subducting_plate_models/temperature/interface.cc @@ -17,11 +17,11 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/subducting_plate_models/temperature/interface.h" -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" #include diff --git a/source/features/subducting_plate_models/temperature/linear.cc b/source/features/subducting_plate_models/temperature/linear.cc index 884ad475f..b6a92c584 100644 --- a/source/features/subducting_plate_models/temperature/linear.cc +++ b/source/features/subducting_plate_models/temperature/linear.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/linear.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/subducting_plate_models/temperature/plate_model.cc b/source/features/subducting_plate_models/temperature/plate_model.cc index 5812f89ef..4c5f30172 100644 --- a/source/features/subducting_plate_models/temperature/plate_model.cc +++ b/source/features/subducting_plate_models/temperature/plate_model.cc @@ -17,18 +17,18 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/plate_model.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/point.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/subducting_plate_models/temperature/uniform.cc b/source/features/subducting_plate_models/temperature/uniform.cc index a05275d83..7661a652a 100644 --- a/source/features/subducting_plate_models/temperature/uniform.cc +++ b/source/features/subducting_plate_models/temperature/uniform.cc @@ -17,15 +17,15 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/features/subducting_plate_models/temperature/uniform.h" + +#include "world_builder/assert.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/string.h" +#include "world_builder/utilities.h" namespace WorldBuilder diff --git a/source/features/utilities.cc b/source/features/utilities.cc index a267e6ca2..61bfb047a 100644 --- a/source/features/utilities.cc +++ b/source/features/utilities.cc @@ -17,7 +17,7 @@ along with this program. If not, see . */ -#include +#include "world_builder/features/utilities.h" namespace WorldBuilder { diff --git a/source/parameters.cc b/source/parameters.cc index 0fd2e23c5..091b341d5 100644 --- a/source/parameters.cc +++ b/source/parameters.cc @@ -17,42 +17,42 @@ along with this program. If not, see . */ -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/parameters.h" + +#include "world_builder/assert.h" +#include "world_builder/config.h" +#include "world_builder/utilities.h" + +#include "world_builder/types/array.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/point.h" +#include "world_builder/types/segment.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" + +#include "world_builder/features/continental_plate_models/composition/interface.h" +#include "world_builder/features/continental_plate_models/grains/interface.h" +#include "world_builder/features/continental_plate_models/temperature/interface.h" +#include "world_builder/features/mantle_layer_models/composition/interface.h" +#include "world_builder/features/mantle_layer_models/grains/interface.h" +#include "world_builder/features/mantle_layer_models/temperature/interface.h" +#include "world_builder/features/oceanic_plate_models/composition/interface.h" +#include "world_builder/features/oceanic_plate_models/grains/interface.h" +#include "world_builder/features/oceanic_plate_models/temperature/interface.h" +#include "world_builder/features/subducting_plate_models/composition/interface.h" +#include "world_builder/features/subducting_plate_models/grains/interface.h" +#include "world_builder/features/subducting_plate_models/temperature/interface.h" + +#include "world_builder/features/fault.h" +#include "world_builder/features/fault_models/composition/interface.h" +#include "world_builder/features/fault_models/grains/interface.h" +#include "world_builder/features/fault_models/temperature/interface.h" +#include "world_builder/features/subducting_plate.h" +#include "world_builder/features/subducting_plate_models/composition/interface.h" +#include "world_builder/features/subducting_plate_models/grains/interface.h" +#include "world_builder/features/subducting_plate_models/temperature/interface.h" #include "rapidjson/error/en.h" diff --git a/source/point.cc b/source/point.cc index 1548ac527..f2583ac15 100644 --- a/source/point.cc +++ b/source/point.cc @@ -17,9 +17,9 @@ along with this program. If not, see . */ -#include +#include "world_builder/point.h" -#include +#include "world_builder/assert.h" #include #include diff --git a/source/types/array.cc b/source/types/array.cc index 534e25cc0..081f9c206 100644 --- a/source/types/array.cc +++ b/source/types/array.cc @@ -16,10 +16,10 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/array.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/parameters.h" namespace WorldBuilder { diff --git a/source/types/bool.cc b/source/types/bool.cc index ba4f362d6..1b3871d51 100644 --- a/source/types/bool.cc +++ b/source/types/bool.cc @@ -16,10 +16,10 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/bool.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/utilities.h" namespace WorldBuilder { diff --git a/source/types/double.cc b/source/types/double.cc index 7fcebd297..5cc0a603d 100644 --- a/source/types/double.cc +++ b/source/types/double.cc @@ -16,10 +16,10 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/double.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/utilities.h" namespace WorldBuilder { diff --git a/source/types/interface.cc b/source/types/interface.cc index 3c00590c5..a304084d6 100644 --- a/source/types/interface.cc +++ b/source/types/interface.cc @@ -17,9 +17,9 @@ along with this program. If not, see . */ -#include +#include "world_builder/types/interface.h" -#include +#include "world_builder/assert.h" #include diff --git a/source/types/object.cc b/source/types/object.cc index c34efcbc4..ac7c55261 100644 --- a/source/types/object.cc +++ b/source/types/object.cc @@ -17,10 +17,10 @@ along with this program. If not, see . */ -#include +#include "world_builder/types/object.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/parameters.h" #include diff --git a/source/types/plugin_system.cc b/source/types/plugin_system.cc index 88dd84cc3..c206e47e1 100644 --- a/source/types/plugin_system.cc +++ b/source/types/plugin_system.cc @@ -16,9 +16,9 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/plugin_system.h" -#include +#include "world_builder/assert.h" #include diff --git a/source/types/point.cc b/source/types/point.cc index e9424f444..db240b196 100644 --- a/source/types/point.cc +++ b/source/types/point.cc @@ -16,10 +16,10 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/point.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/utilities.h" #include diff --git a/source/types/segment.cc b/source/types/segment.cc index 2d9ffae2e..67a0a5e47 100644 --- a/source/types/segment.cc +++ b/source/types/segment.cc @@ -16,17 +16,17 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/types/segment.h" + +#include "world_builder/assert.h" +#include "world_builder/features/fault_models/composition/interface.h" +#include "world_builder/features/fault_models/grains/interface.h" +#include "world_builder/features/fault_models/temperature/interface.h" +#include "world_builder/features/subducting_plate_models/composition/interface.h" +#include "world_builder/features/subducting_plate_models/grains/interface.h" +#include "world_builder/features/subducting_plate_models/temperature/interface.h" +#include "world_builder/parameters.h" +#include "world_builder/utilities.h" namespace WorldBuilder { diff --git a/source/types/string.cc b/source/types/string.cc index 223e95ba2..dddb82a47 100644 --- a/source/types/string.cc +++ b/source/types/string.cc @@ -16,10 +16,10 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/string.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/parameters.h" #include diff --git a/source/types/unsigned_int.cc b/source/types/unsigned_int.cc index 63f712c50..1e172cba4 100644 --- a/source/types/unsigned_int.cc +++ b/source/types/unsigned_int.cc @@ -16,12 +16,12 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see . */ -#include +#include "world_builder/types/unsigned_int.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/utilities.h" -#include +#include "world_builder/nan.h" namespace WorldBuilder { diff --git a/source/utilities.cc b/source/utilities.cc index 7fbf1d0dc..60f4e1180 100644 --- a/source/utilities.cc +++ b/source/utilities.cc @@ -17,10 +17,10 @@ along with this program. If not, see . */ -#include -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/coordinate_systems/interface.h" +#include "world_builder/nan.h" +#include "world_builder/utilities.h" #include #include diff --git a/source/world.cc b/source/world.cc index b7b13cc7c..1c8bfd7d2 100644 --- a/source/world.cc +++ b/source/world.cc @@ -17,25 +17,25 @@ along with this program. If not, see . */ -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include "world_builder/world.h" + +#include "world_builder/assert.h" +#include "world_builder/config.h" +#include "world_builder/coordinate_systems/interface.h" +#include "world_builder/nan.h" +#include "world_builder/parameters.h" +#include "world_builder/point.h" +#include "world_builder/types/interface.h" +#include "world_builder/utilities.h" + +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/point.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" #include "rapidjson/pointer.h" diff --git a/source/wrapper_c.cc b/source/wrapper_c.cc index 7724e761a..193da8130 100644 --- a/source/wrapper_c.cc +++ b/source/wrapper_c.cc @@ -17,10 +17,10 @@ along with this program. If not, see . */ -#include +#include "world_builder/wrapper_c.h" -#include -#include +#include "world_builder/assert.h" +#include "world_builder/world.h" extern "C" { /** diff --git a/tests/C/example.c b/tests/C/example.c index 854728317..6c158fa50 100644 --- a/tests/C/example.c +++ b/tests/C/example.c @@ -1,5 +1,5 @@ -#include +#include "world_builder/wrapper_c.h" #include int main(int argc, char *argv[]) { diff --git a/tests/CPP_MPI/example.cpp b/tests/CPP_MPI/example.cpp index 0e1f4fc08..5073af111 100644 --- a/tests/CPP_MPI/example.cpp +++ b/tests/CPP_MPI/example.cpp @@ -1,5 +1,5 @@ -#include +#include "world_builder/world.h" #include #include diff --git a/tests/unit_tests/unit_test_wb_glm.cc b/tests/unit_tests/unit_test_wb_glm.cc index f37fecf62..c433a39eb 100644 --- a/tests/unit_tests/unit_test_wb_glm.cc +++ b/tests/unit_tests/unit_test_wb_glm.cc @@ -22,7 +22,7 @@ #include -#include +#include "world_builder/utilities.h" #include "glm/glm.h" diff --git a/tests/unit_tests/unit_test_world_builder.cc b/tests/unit_tests/unit_test_world_builder.cc index 6071e229b..2e417a61a 100644 --- a/tests/unit_tests/unit_test_world_builder.cc +++ b/tests/unit_tests/unit_test_world_builder.cc @@ -24,32 +24,32 @@ #include -#include -#include - -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include +#include "world_builder/config.h" +#include "world_builder/coordinate_systems/interface.h" + +#include "world_builder/features/continental_plate.h" +#include "world_builder/features/fault_models/composition/uniform.h" +#include "world_builder/features/fault_models/grains/interface.h" +#include "world_builder/features/fault_models/temperature/uniform.h" +#include "world_builder/features/interface.h" + +#include "world_builder/point.h" + +#include "world_builder/types/array.h" +#include "world_builder/types/bool.h" +#include "world_builder/types/double.h" +#include "world_builder/types/object.h" +#include "world_builder/types/plugin_system.h" +#include "world_builder/types/point.h" +#include "world_builder/types/segment.h" +#include "world_builder/types/string.h" +#include "world_builder/types/unsigned_int.h" + +#include "world_builder/utilities.h" extern "C" { -#include +#include "world_builder/wrapper_c.h" } -#include +#include "world_builder/wrapper_cpp.h" #include "glm/glm.h" diff --git a/visualization/main.cc b/visualization/main.cc index 6920d665c..d1f87bb40 100644 --- a/visualization/main.cc +++ b/visualization/main.cc @@ -23,16 +23,16 @@ * the author of GHOST. */ -#include +#include "visualization/main.h" -#include -#include -#include -#include -#include +#include "world_builder/assert.h" +#include "world_builder/coordinate_system.h" +#include "world_builder/nan.h" +#include "world_builder/utilities.h" +#include "world_builder/world.h" -#include +#include "vtu11/vtu11.hpp" #undef max #undef min