large model runs with multiple layers and vdf

rreinecke · Oct 26, 2023 · f4ac0b0 · f4ac0b0
1 parent 6f24cd5
commit f4ac0b0
Show file tree

Hide file tree

Showing 13 changed files with 353 additions and 374 deletions.
diff --git a/src/DataProcessing/DataReader.hpp b/src/DataProcessing/DataReader.hpp
@@ -242,6 +242,7 @@ namespace GlobalFlow {
                      double specificStorage,
                      bool useEfolding,
                      bool confined,
+                     large_num maxRefinement,
                      bool isDensityVariable,
                      double effPorosity,
                      double maxTipSlope,
@@ -286,7 +287,7 @@ namespace GlobalFlow {
                                                             useEfolding,
                                                             confined,
                                                             refID,
-                                                            false,
+                                                            maxRefinement,
                                                             isDensityVariable,
                                                             delnus,
                                                             nusInZones,
@@ -335,6 +336,7 @@ namespace GlobalFlow {
                             double specificStorage,
                             bool useEfolding,
                             bool confined,
+                            large_num maxRefinement,
                             bool isDensityVariable,
                             double effPorosity,
                             double maxTipSlope,
@@ -379,7 +381,7 @@ namespace GlobalFlow {
                                                             useEfolding,
                                                             confined,
                                                             refID,
-                                                            false,
+                                                            maxRefinement,
                                                             isDensityVariable,
                                                             delnus,
                                                             nusInZones,

diff --git a/src/DataProcessing/Neighbouring.cpp b/src/DataProcessing/Neighbouring.cpp
@@ -348,8 +348,8 @@ void buildBottomLayers(NodeVector nodes,
     size_t nodesPerLayer = nodes->size();
     nodes->reserve(numberOfLayers * nodesPerLayer);
 
-    LOG(debug) << "Building additional layers with node count: " << nodesPerLayer << " for " << numberOfLayers
-               << " layers";
+    //LOG(debug) << "Building additional layers with node count: " << nodesPerLayer << " for " << numberOfLayers
+    //           << " layers";
 
     size_t id = nodesPerLayer;
     large_num spatID;
@@ -365,7 +365,7 @@ void buildBottomLayers(NodeVector nodes,
     double specificStorage;
     bool useEfolding;
     large_num refID;
-    bool hasRefinedNeighbour;
+    large_num maxRefinement;
     bool densityVariable;
     std::vector<Model::quantity<Model::Dimensionless>> delnus;
     std::vector<Model::quantity<Model::Dimensionless>> nusInZones;
@@ -399,7 +399,7 @@ void buildBottomLayers(NodeVector nodes,
                             Model::SpecificStorage>().value();
             useEfolding = nodes->at(i)->getProperties().get<bool, Model::UseEfolding>();
             refID = nodes->at(i)->getProperties().get<large_num, Model::RefID>();
-            hasRefinedNeighbour = nodes->at(i)->getProperties().get<bool, Model::HasRefinedNeighbour>();
+            maxRefinement = nodes->at(i)->getProperties().get<large_num, Model::MaxRefinement>();
             densityVariable = nodes->at(i)->getProperties().get<bool, Model::DensityVariable>();
             delnus = nodes->at(i)->getProperties().
                     get<std::vector<Model::quantity<Model::Dimensionless>>, Model::Delnus>();
@@ -439,7 +439,7 @@ void buildBottomLayers(NodeVector nodes,
                                                             useEfolding,
                                                             confined[layer + 1],
                                                             refID,
-                                                            hasRefinedNeighbour,
+                                                            maxRefinement,
                                                             densityVariable,
                                                             delnus,
                                                             nusInZones,
@@ -464,8 +464,8 @@ void buildBottomLayers(NodeVector nodes,
             }
         }
     }
-    LOG(debug) << "Last nodeID was " << id << " with max ID (with non static nodes) "
-               << nodesPerLayer * numberOfLayers;
+    //LOG(debug) << "Last nodeID was " << id << " with max ID (with non static nodes) "
+    //           << nodesPerLayer * numberOfLayers;
 };
 
 }//ns

diff --git a/src/Model/Node.cpp b/src/Model/Node.cpp
@@ -15,6 +15,7 @@ PhysicalProperties initProperties() {
     fields.emplace < large_num, ID > (0);
     fields.emplace < large_num, SpatID > (0);
     fields.emplace < large_num, RefID > (0);
+    fields.emplace < large_num, MaxRefinement > (0);
     fields.emplace<double, Lat>(0);
     fields.emplace<double, Lon>(0);
     fields.emplace<int, Layer>(0);
@@ -59,7 +60,7 @@ NodeInterface::NodeInterface(NodeVector nodes,
                              bool useEfolding,
                              bool confined,
                              large_num refID,
-                             bool hasRefinedNeighbour,
+                             large_num maxRefinement,
                              bool densityVariable,
                              std::vector<quantity<Dimensionless>> delnus,
                              std::vector<quantity<Dimensionless>> nusInZones,
@@ -92,7 +93,7 @@ NodeInterface::NodeInterface(NodeVector nodes,
     fields.emplace<quantity<CubicMeter>, VolumeOfCell>(
             fields.get<quantity<SquareMeter>, Area>() * fields.get<quantity<Meter>, VerticalSize>());
     fields.set<large_num, RefID> (refID);
-    fields.set<bool, HasRefinedNeighbour> (hasRefinedNeighbour);
+    fields.set<large_num, MaxRefinement> (maxRefinement);
     fields.set<bool, DensityVariable> (densityVariable);
     fields.set<std::vector<quantity<Dimensionless>>, Delnus> (delnus);
     fields.set<std::vector<quantity<Dimensionless>>, NusInZones> (nusInZones);