rename features/utilities to features/featureutilites.

GeodynamicWorldBuilder · Feb 17, 2023 · 41d14a2 · 41d14a2
1 parent 5eec9eb
commit 41d14a2
Show file tree

Hide file tree

Showing 71 changed files with 215 additions and 197 deletions.
diff --git a/include/world_builder/features/continental_plate_models/composition/uniform.h b/include/world_builder/features/continental_plate_models/composition/uniform.h
@@ -23,13 +23,14 @@
 
 #include "world_builder/features/continental_plate_models/composition/interface.h"
 #include "world_builder/objects/surface.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 
 
 namespace WorldBuilder
 {
   namespace Features
   {
+    using namespace FeatureUtilities;
     namespace ContinentalPlateModels
     {
       namespace Composition
@@ -87,7 +88,7 @@ namespace WorldBuilder
             Objects::Surface max_depth_surface;
             std::vector<unsigned int> compositions;
             std::vector<double> fractions;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Composition

diff --git a/include/world_builder/features/continental_plate_models/temperature/adiabatic.h b/include/world_builder/features/continental_plate_models/temperature/adiabatic.h
@@ -22,7 +22,7 @@
 
 
 #include "world_builder/features/continental_plate_models/temperature/interface.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 #include "world_builder/objects/surface.h"
 
 
@@ -31,6 +31,7 @@ namespace WorldBuilder
 
   namespace Features
   {
+    using namespace FeatureUtilities;
     namespace ContinentalPlateModels
     {
       namespace Temperature
@@ -101,7 +102,7 @@ namespace WorldBuilder
              */
             double specific_heat;
 
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Temperature

diff --git a/include/world_builder/features/continental_plate_models/temperature/linear.h b/include/world_builder/features/continental_plate_models/temperature/linear.h
@@ -22,7 +22,7 @@
 
 
 #include "world_builder/features/continental_plate_models/temperature/interface.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 #include "world_builder/objects/surface.h"
 
 
@@ -31,6 +31,7 @@ namespace WorldBuilder
 
   namespace Features
   {
+    using namespace FeatureUtilities;
     namespace ContinentalPlateModels
     {
       namespace Temperature
@@ -87,7 +88,7 @@ namespace WorldBuilder
             Objects::Surface max_depth_surface;
             double top_temperature;
             double bottom_temperature;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Temperature

diff --git a/include/world_builder/features/continental_plate_models/temperature/uniform.h b/include/world_builder/features/continental_plate_models/temperature/uniform.h
@@ -22,7 +22,7 @@
 
 
 #include "world_builder/features/continental_plate_models/temperature/interface.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 #include "world_builder/objects/surface.h"
 
 
@@ -31,6 +31,7 @@ namespace WorldBuilder
 
   namespace Features
   {
+    using namespace FeatureUtilities;
     namespace ContinentalPlateModels
     {
       namespace Temperature
@@ -86,7 +87,7 @@ namespace WorldBuilder
             double max_depth;
             Objects::Surface max_depth_surface;
             double temperature;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Temperature

diff --git a/include/world_builder/features/fault_models/composition/interface.h b/include/world_builder/features/fault_models/composition/interface.h
@@ -23,7 +23,7 @@
 #include "world_builder/grains.h"
 #include "world_builder/parameters.h"
 #include "world_builder/utilities.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 
 #include <map>
 #include <vector>
@@ -40,7 +40,7 @@ namespace WorldBuilder
    */
   namespace Features
   {
-
+    using namespace FeatureUtilities;
     namespace FaultModels
     {
       namespace Composition
@@ -87,7 +87,7 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const = 0;
+                                   const AdditionalParameters &additional_paramters) const = 0;
             /**
              * A function to register a new type. This is part of the automatic
              * registration of the object factory.

diff --git a/include/world_builder/features/fault_models/composition/smooth.h b/include/world_builder/features/fault_models/composition/smooth.h
@@ -21,14 +21,15 @@
 #define _world_builder_features_fault_composition_smooth_h
 
 #include <world_builder/features/fault_models/composition/interface.h>
-#include <world_builder/features/utilities.h>
+#include <world_builder/features/feature_utilities.h>
 #include <world_builder/world.h>
 
 
 namespace WorldBuilder
 {
   namespace Features
   {
+    using namespace FeatureUtilities;
     namespace FaultModels
     {
       namespace Composition
@@ -75,7 +76,7 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const override final;
+                                   const AdditionalParameters &additional_paramters) const override final;
 
           private:
             // linear temperature submodule parameters
@@ -85,7 +86,7 @@ namespace WorldBuilder
             // currenly not using the side composition, but maybe usefu if you want another composition towards the end
             std::vector<double> side_fraction;
             std::vector<unsigned int> compositions;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       }

diff --git a/include/world_builder/features/fault_models/composition/uniform.h b/include/world_builder/features/fault_models/composition/uniform.h
@@ -75,7 +75,7 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const override final;
+                                   const AdditionalParameters &additional_paramters) const override final;
 
 
           private:
@@ -84,7 +84,7 @@ namespace WorldBuilder
             double max_depth;
             std::vector<unsigned int> compositions;
             std::vector<double> fractions;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Composition

diff --git a/include/world_builder/features/fault_models/grains/interface.h b/include/world_builder/features/fault_models/grains/interface.h
@@ -23,7 +23,7 @@
 #include "world_builder/grains.h"
 #include "world_builder/parameters.h"
 #include "world_builder/utilities.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 
 #include <map>
 #include <vector>
@@ -40,7 +40,7 @@ namespace WorldBuilder
    */
   namespace Features
   {
-
+    using namespace FeatureUtilities;
     namespace FaultModels
     {
       namespace Grains
@@ -88,7 +88,7 @@ namespace WorldBuilder
                        const double feature_min_depth,
                        const double feature_max_depth,
                        const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                       const Utilities::AdditionalParameters &additional_paramters) const = 0;
+                       const AdditionalParameters &additional_paramters) const = 0;
             /**
              * A function to register a new type. This is part of the automatic
              * registration of the object factory.

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
@@ -28,6 +28,7 @@ namespace WorldBuilder
 
   namespace Features
   {
+    using namespace FeatureUtilities;
     namespace FaultModels
     {
       namespace Grains
@@ -92,7 +93,7 @@ namespace WorldBuilder
                        const double feature_min_depth,
                        const double feature_max_depth,
                        const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                       const Utilities::AdditionalParameters &additional_paramters) const override final;
+                       const AdditionalParameters &additional_paramters) const override final;
 
           private:
             // uniform grains submodule parameters

diff --git a/include/world_builder/features/fault_models/grains/uniform.h b/include/world_builder/features/fault_models/grains/uniform.h
@@ -92,7 +92,7 @@ namespace WorldBuilder
                        const double feature_min_depth,
                        const double feature_max_depth,
                        const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                       const Utilities::AdditionalParameters &additional_paramters) const override final;
+                       const AdditionalParameters &additional_paramters) const override final;
 
           private:
             // uniform grains submodule parameters

diff --git a/include/world_builder/features/fault_models/temperature/adiabatic.h b/include/world_builder/features/fault_models/temperature/adiabatic.h
@@ -22,7 +22,7 @@
 
 
 #include "world_builder/features/fault_models/temperature/interface.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 
 
 namespace WorldBuilder
@@ -76,7 +76,7 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const override final;
+                                   const AdditionalParameters &additional_paramters) const override final;
 
 
           private:
@@ -99,7 +99,7 @@ namespace WorldBuilder
              */
             double specific_heat;
 
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Temperature

diff --git a/include/world_builder/features/fault_models/temperature/interface.h b/include/world_builder/features/fault_models/temperature/interface.h
@@ -23,7 +23,7 @@
 #include "world_builder/grains.h"
 #include "world_builder/parameters.h"
 #include "world_builder/utilities.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 
 #include <map>
 #include <vector>
@@ -40,7 +40,7 @@ namespace WorldBuilder
    */
   namespace Features
   {
-
+    using namespace FeatureUtilities;
     namespace FaultModels
     {
       namespace Temperature
@@ -87,7 +87,7 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const = 0;
+                                   const AdditionalParameters &additional_paramters) const = 0;
             /**
              * A function to register a new type. This is part of the automatic
              * registration of the object factory.

diff --git a/include/world_builder/features/fault_models/temperature/linear.h b/include/world_builder/features/fault_models/temperature/linear.h
@@ -75,7 +75,7 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const override final;
+                                   const AdditionalParameters &additional_paramters) const override final;
 
 
           private:
@@ -84,7 +84,7 @@ namespace WorldBuilder
             double max_depth;
             double center_temperature;
             double side_temperature;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Temperature

diff --git a/include/world_builder/features/fault_models/temperature/uniform.h b/include/world_builder/features/fault_models/temperature/uniform.h
@@ -22,7 +22,7 @@
 
 
 #include "world_builder/features/fault_models/temperature/interface.h"
-#include "world_builder/features/utilities.h"
+#include "world_builder/features/feature_utilities.h"
 
 
 namespace WorldBuilder
@@ -76,15 +76,15 @@ namespace WorldBuilder
                                    const double feature_min_depth,
                                    const double feature_max_depth,
                                    const WorldBuilder::Utilities::PointDistanceFromCurvedPlanes &distance_from_planes,
-                                   const Utilities::AdditionalParameters &additional_paramters) const override final;
+                                   const AdditionalParameters &additional_paramters) const override final;
 
 
           private:
             // uniform temperature submodule parameters
             double min_depth;
             double max_depth;
             double temperature;
-            Utilities::Operations operation;
+            Operations operation;
 
         };
       } // namespace Temperature

diff --git a/include/world_builder/features/utilities.h → ...orld_builder/features/feature_utilities.h b/include/world_builder/features/utilities.h → ...orld_builder/features/feature_utilities.h
@@ -18,8 +18,8 @@
 */
 
 
-#ifndef WORLD_BUILDER_FEATURES_UTILITIES_H
-#define WORLD_BUILDER_FEATURES_UTILITIES_H
+#ifndef WORLD_BUILDER_FEATURES_FEATURE_UTILITIES_H
+#define WORLD_BUILDER_FEATURES_FEATURE_UTILITIES_H
 
 #include <limits>
 
@@ -29,7 +29,7 @@ namespace WorldBuilder
 {
   namespace Features
   {
-    namespace Utilities
+    namespace FeatureUtilities
     {
       enum class Operations
       {
@@ -47,22 +47,22 @@ namespace WorldBuilder
        * Applies different opertions such as replace, add and subtract to the original values
        */
       inline double
-      apply_operation(const Utilities::Operations operation,
+      apply_operation(const Operations operation,
                       const double old_value,
                       const double new_value)
       {
         switch (operation)
           {
-            case Utilities::Operations::REPLACE:
-            case Utilities::Operations::REPLACE_DEFINED_ONLY:
+            case Operations::REPLACE:
+            case Operations::REPLACE_DEFINED_ONLY:
               return new_value;
               break;
 
-            case Utilities::Operations::ADD:
+            case Operations::ADD:
               return old_value + new_value;
               break;
 
-            case Utilities::Operations::SUBTRACT:
+            case Operations::SUBTRACT:
               return old_value - new_value;
 
             default: