WIP V2.0 refinement model

applications/solvers/additiveFoam/additiveFoam.C

@@ -54,7 +54,6 @@ Description
 #include "EulerDdtScheme.H"
 #include "CrankNicolsonDdtScheme.H"
 
-// AdditiveFOAM Headers
 #include "additiveFoamInfo.H"
 #include "movingHeatSourceModel.H"
 #include "graph.H"
@@ -116,7 +115,7 @@ int main(int argc, char *argv[])
         }
 
         #include "thermo/TEqn.H"
-        
+
         runTime.write();
 
         Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"

applications/solvers/additiveFoam/movingHeatSource/Make/files

@@ -3,7 +3,7 @@ absorptionModels/absorptionModel/absorptionModelNew.C
 absorptionModels/constant/constantAbsorption.C
 absorptionModels/Kelly/KellyAbsorption.C
 
-segment/segment.C
+pathVector/pathVector.C
 
 movingBeam/movingBeam.C
 
@@ -13,6 +13,13 @@ heatSourceModels/superGaussian/superGaussian.C
 heatSourceModels/modifiedSuperGaussian/modifiedSuperGaussian.C
 heatSourceModels/projectedGaussian/projectedGaussian.C
 
+refinementModels/refinementModel/refinementModel.C
+refinementModels/refinementModel/refinementModelNew.C
+refinementModels/noRefinementModel/noRefinementModel.C
+refinementModels/timeStep/timeStep.C
+refinementModels/targetCellLoad/targetCellLoad.C
+refinementModels/uniformTimeIntervals/uniformTimeIntervals.C
+
 movingHeatSourceModel/movingHeatSourceModel.C
 
 LIB = $(FOAM_USER_LIBBIN)/libmovingBeamModels

applications/solvers/additiveFoam/movingHeatSource/Make/options

@@ -2,7 +2,8 @@ EXE_INC = \
     -ImovingBeam \
     -IheatSourceModels \
     -IabsorptionModels \
-    -Isegment \
+    -IpathVector \
+    -IrefinementModel \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/OpenFOAM/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude

applications/solvers/additiveFoam/movingHeatSource/heatSourceModels/heatSourceModel/heatSourceModel.C

@@ -87,7 +87,6 @@ Foam::heatSourceModel::heatSourceModel
     heatSourceDict_(dict),
     sourceDict_(heatSourceDict_.optionalSubDict(sourceName_)),
     heatSourceModelCoeffs_(sourceDict_.optionalSubDict(type + "Coeffs")),
-
     mesh_(mesh),
     absorptionModel_(nullptr),
     movingBeam_(nullptr)
@@ -250,7 +249,7 @@ Foam::heatSourceModel::qDot()
         const scalar aspectRatio = 
             dimensions_.z() / min(dimensions_.x(), dimensions_.y());
 
-        dimensionedScalar absorbedPower
+        const dimensionedScalar absorbedPower
         (
             "etaP",
             dimPower,

applications/solvers/additiveFoam/movingHeatSource/heatSourceModels/heatSourceModel/heatSourceModel.H

@@ -156,33 +156,39 @@ public:
 
 
     // Member Functions
-    
+
         //- Return access to the movingBeam instance
-        movingBeam& beam()
+        inline movingBeam& beam()
         {
             return movingBeam_();
         }
-
+
+        //- Return const access to the movingBeam instance
+        inline const movingBeam& beam() const
+        {
+            return movingBeam_();
+        }
+
         //- Return boolean of heat source type
-        Switch transient()
+        inline Switch transient() const
         {
             return transient_;
         }
 
         //- Return scalar of the isovalue
-        scalar isoValue()
+        inline scalar isoValue() const
         {
             return isoValue_;
         }
 
         //- Return vector of current heat source dimensions
-        vector dimensions()
+        inline vector dimensions() const
         {
             return dimensions_;
         }
 
         //- Return vector of original heat source dimensions
-        vector staticDimensions()
+        inline vector staticDimensions() const
         {
             return staticDimensions_;
         }