From 536085f67fc08966bab99b4b95450a8c006c3e6b Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Fri, 19 Sep 2025 15:24:46 -0400
Subject: [PATCH 1/8] add function object for solidification data

---
 .../additiveFoam/functionObjects/Make/files   |   4 +
 .../additiveFoam/functionObjects/Make/options |   7 +
 .../solidificationData/solidificationData.C   | 231 ++++++++++++++++++
 .../solidificationData/solidificationData.H   | 135 ++++++++++
 tutorials/AMB2018-02-B/Allclean               |   2 +
 tutorials/AMB2018-02-B/Allrun                 |   6 -
 tutorials/AMB2018-02-B/system/ExaCA           |  19 --
 tutorials/AMB2018-02-B/system/controlDict     |  21 ++
 tutorials/multiBeam/Allclean                  |   2 +
 tutorials/multiBeam/Allrun                    |   6 -
 tutorials/multiBeam/system/ExaCA              |  19 --
 tutorials/multiBeam/system/controlDict        |  22 +-
 tutorials/multiLayerPBF/Allclean              |   7 +-
 tutorials/multiLayerPBF/Allrun                |   6 -
 tutorials/multiLayerPBF/system/ExaCA          |  19 --
 tutorials/multiLayerPBF/system/controlDict    |  22 ++
 16 files changed, 447 insertions(+), 81 deletions(-)
 create mode 100644 applications/solvers/additiveFoam/functionObjects/Make/files
 create mode 100644 applications/solvers/additiveFoam/functionObjects/Make/options
 create mode 100644 applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C
 create mode 100644 applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.H
 delete mode 100644 tutorials/AMB2018-02-B/system/ExaCA
 delete mode 100644 tutorials/multiBeam/system/ExaCA
 delete mode 100644 tutorials/multiLayerPBF/system/ExaCA

diff --git a/applications/solvers/additiveFoam/functionObjects/Make/files b/applications/solvers/additiveFoam/functionObjects/Make/files
new file mode 100644
index 0000000..194ab9e
--- /dev/null
+++ b/applications/solvers/additiveFoam/functionObjects/Make/files
@@ -0,0 +1,4 @@
+ExaCA/ExaCA.C
+solidificationData/solidificationData.C
+
+LIB = $(FOAM_USER_LIBBIN)/libadditiveFoamFunctionObjects
diff --git a/applications/solvers/additiveFoam/functionObjects/Make/options b/applications/solvers/additiveFoam/functionObjects/Make/options
new file mode 100644
index 0000000..a3ae8da
--- /dev/null
+++ b/applications/solvers/additiveFoam/functionObjects/Make/options
@@ -0,0 +1,7 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C b/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C
new file mode 100644
index 0000000..47e589a
--- /dev/null
+++ b/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C
@@ -0,0 +1,231 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+                Copyright (C) 2023 Oak Ridge National Laboratory                
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "solidificationData.H"
+#include "Time.H"
+#include "fvMesh.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+#include "fvc.H"
+#include "OFstream.H"
+#include "OSspecific.H"
+#include "labelVector.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+    defineTypeNameAndDebug(solidificationData, 0);
+    
+    addToRunTimeSelectionTable
+    (
+        functionObject,
+        solidificationData,
+        dictionary
+    );
+}
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::solidificationData::solidificationData
+(
+    const word& name,
+    const Time& runTime,
+    const dictionary& dict
+)
+:
+    fvMeshFunctionObject(name, runTime, dict),
+    T_(mesh_.lookupObject<VolField<scalar>>("T")),
+    R_
+    (
+        IOobject
+        (
+            "R",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        fvc::ddt(T_)
+    ),
+    searchEngine_(mesh_, polyMesh::CELL_TETS)
+{
+    read(dict);
+    
+    setOverlapCells();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::functionObjects::solidificationData::~solidificationData()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::functionObjects::solidificationData::read(const dictionary& dict)
+{
+    box_ = dict.lookup("box");
+    isoValue_ = dict.lookup<scalar>("isoValue");
+    
+    return true;
+}
+
+void Foam::functionObjects::solidificationData::setOverlapCells()
+{
+    // create a compact cell-stencil using the overlap sub-space
+    const pointField& points = mesh_.points();
+
+    boundBox procBb(points);
+
+    const vector extend = 1e-10*vector::one;
+
+    if (procBb.overlaps(box_))
+    {
+        forAll(mesh_.cells(), celli)
+        {
+            boundBox cellBb(point::max, point::min);
+
+            const labelList& vertices = mesh_.cellPoints()[celli];
+
+            forAll(vertices, i)
+            {
+                cellBb.min() = min(cellBb.min(), points[vertices[i]] - extend);
+                cellBb.max() = max(cellBb.max(), points[vertices[i]] + extend);
+            }
+
+            if (cellBb.overlaps(box_))
+            {
+                overlapCells.append(celli);
+            }
+        }
+    }
+
+    overlapCells.shrink();
+}
+
+
+Foam::wordList Foam::functionObjects::solidificationData::fields() const
+{
+    return wordList::null();
+}
+
+
+bool Foam::functionObjects::solidificationData::execute()
+{
+    //- Get current time
+    const scalar& time = mesh_.time().value();
+
+    //- Get the temperature at the previous time
+    const volScalarField& T0_ = T_.oldTime();
+    
+    //- Calculate the thermal gradient
+    const volScalarField G("G", mag(fvc::grad(T_)));
+    
+    forAll(overlapCells, i)
+    {
+        label celli = overlapCells[i];
+        
+        // Cooled below specified isotherm
+        if ((T0_[celli] > isoValue_) && (T_[celli] <= isoValue_))
+        {
+            const scalar Ri = mag(R_[celli]);
+            const scalar Gi = max(G[celli], small);
+
+            const vector pt = mesh_.C()[celli];
+
+            List<scalar> event(7);
+            
+            event[0] = pt[0];
+            event[1] = pt[1];
+            event[2] = pt[2];
+            event[3] = time;
+            event[4] = Ri;
+            event[5] = Gi;
+            event[6] = Ri / Gi;
+                        
+            events.append(event);
+        }
+    }
+
+    //- Update cooling rate
+    R_ = fvc::ddt(T_);
+       
+    return true;
+}
+
+bool Foam::functionObjects::solidificationData::end()
+{
+    Info<< "Number of solidification events: "
+        << returnReduce(events.size(), sumOp<scalar>()) << endl;
+
+    const fileName filePath
+    (
+        mesh_.time().rootPath()
+       /mesh_.time().globalCaseName()
+       /"solidificationData"
+    );
+    
+    mkDir(filePath);
+
+    OFstream os
+    (
+       filePath + "/" + "data_" + Foam::name(Pstream::myProcNo()) + ".csv"
+    );
+    
+    os << "x,y,z,t,R,G,V" << endl;
+
+    for(int i=0; i < events.size(); i++)
+    {
+        int n = events[i].size() - 1;
+
+        for(int j=0; j < n; j++)
+        {
+            os << events[i][j] << ",";
+        }
+        os << events[i][n] << "\n";
+    }
+
+    Info<< "Successfully wrote solidification data in: "
+        << returnReduce(mesh_.time().cpuTimeIncrement(), maxOp<scalar>()) << " s"
+        << endl << endl;
+
+    return true;
+}
+
+
+bool Foam::functionObjects::solidificationData::write()
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.H b/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.H
new file mode 100644
index 0000000..519c0ae
--- /dev/null
+++ b/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.H
@@ -0,0 +1,135 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     | Website:  https://openfoam.org
+    \\  /    A nd           | Copyright (C) 2024 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+                Copyright (C) 2023 Oak Ridge National Laboratory                
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::functionObjects::solidificationData
+
+SourceFiles
+    solidificationData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef solidificationData_H
+#define solidificationData_H
+
+#include "fvMeshFunctionObject.H"
+#include "volFields.H"
+#include "meshSearch.H"
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class solidificationData Declaration
+\*---------------------------------------------------------------------------*/
+
+class solidificationData
+:
+    public fvMeshFunctionObject
+{
+    // Private Data
+
+        const volScalarField& T_;
+        
+        volScalarField R_;
+
+        DynamicList<label> overlapCells;
+
+        DynamicList<List<scalar>> events;
+              
+        boundBox  box_;
+
+        scalar    isoValue_;
+        
+        meshSearch searchEngine_;
+
+    // Private Member Functions
+
+
+public:
+
+    //- Runtime type information
+    TypeName("solidificationData");
+
+
+    // Constructors
+
+        //- Construct from Time and dictionary
+        solidificationData
+        (
+            const word& name,
+            const Time& runTime,
+            const dictionary& dict
+        );
+
+        //- Disallow default bitwise copy construction
+        solidificationData(const solidificationData&) = delete;
+
+
+    //- Destructor
+    virtual ~solidificationData();
+
+
+    // Member Functions
+
+        //- Read the solidificationData data
+        virtual bool read(const dictionary&);
+
+        //- Initialize lists
+        virtual void setOverlapCells();
+
+        //- Return the list of fields required
+        virtual wordList fields() const;
+
+        //- Execute, currently does nothing
+        virtual bool execute();
+                                
+        //- Execute at the final time-loop
+        virtual bool end();
+
+        //- Write the solidificationData data
+        virtual bool write();
+
+
+    // Member Operators
+
+        //- Disallow default bitwise assignment
+        void operator=(const solidificationData&) = delete;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/tutorials/AMB2018-02-B/Allclean b/tutorials/AMB2018-02-B/Allclean
index 5c72b39..8e9b87d 100755
--- a/tutorials/AMB2018-02-B/Allclean
+++ b/tutorials/AMB2018-02-B/Allclean
@@ -8,4 +8,6 @@ cleanCase
 #------------------------------------------------------------------------------
 rm -rf ExaCA/Output*
 rm -rf ExaCA/time-temperature.csv
+
+rm -rf solidificationData
 #------------------------------------------------------------------------------
diff --git a/tutorials/AMB2018-02-B/Allrun b/tutorials/AMB2018-02-B/Allrun
index ba6eb2c..e2fd29a 100755
--- a/tutorials/AMB2018-02-B/Allrun
+++ b/tutorials/AMB2018-02-B/Allrun
@@ -16,12 +16,6 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
-if [ "$withExaCA" = true ]; then
-    foamDictionary -entry functions -set "{#includeFunc ExaCA}" system/controlDict
-else
-    foamDictionary -entry functions -set "{}" system/controlDict
-fi
-
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
diff --git a/tutorials/AMB2018-02-B/system/ExaCA b/tutorials/AMB2018-02-B/system/ExaCA
deleted file mode 100644
index fb9b4c4..0000000
--- a/tutorials/AMB2018-02-B/system/ExaCA
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  10
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-ExaCA
-{
-    type ExaCA;
-    libs ("libExaCAFunctionObject.so");
-    
-    box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
-    dx          2.5e-6;
-    isoValue    1620;
-}
-
-// *********************************************************************** //
diff --git a/tutorials/AMB2018-02-B/system/controlDict b/tutorials/AMB2018-02-B/system/controlDict
index 0fcc7a8..fa157c3 100644
--- a/tutorials/AMB2018-02-B/system/controlDict
+++ b/tutorials/AMB2018-02-B/system/controlDict
@@ -55,6 +55,27 @@ maxAlphaCo      1;
 
 functions
 {
+    solidificationData
+    {
+        libs ("libadditiveFoamFunctionObjects.so");
+        
+        type solidificationData;
+                
+        box         (-1 -1 -1) (1 1 1);
+        isoValue    1620;
+    }
+/*
+    ExaCA
+    {
+        libs ("libadditiveFoamFunctionObjects.so");
+        
+        type ExaCA;
+                
+        box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
+        dx          2.5e-6;
+        isoValue    1620;
+    }
+*/
 }
 
 
diff --git a/tutorials/multiBeam/Allclean b/tutorials/multiBeam/Allclean
index 5c72b39..8e9b87d 100755
--- a/tutorials/multiBeam/Allclean
+++ b/tutorials/multiBeam/Allclean
@@ -8,4 +8,6 @@ cleanCase
 #------------------------------------------------------------------------------
 rm -rf ExaCA/Output*
 rm -rf ExaCA/time-temperature.csv
+
+rm -rf solidificationData
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiBeam/Allrun b/tutorials/multiBeam/Allrun
index ba6eb2c..e2fd29a 100755
--- a/tutorials/multiBeam/Allrun
+++ b/tutorials/multiBeam/Allrun
@@ -16,12 +16,6 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
-if [ "$withExaCA" = true ]; then
-    foamDictionary -entry functions -set "{#includeFunc ExaCA}" system/controlDict
-else
-    foamDictionary -entry functions -set "{}" system/controlDict
-fi
-
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
diff --git a/tutorials/multiBeam/system/ExaCA b/tutorials/multiBeam/system/ExaCA
deleted file mode 100644
index 83561cd..0000000
--- a/tutorials/multiBeam/system/ExaCA
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  10
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-ExaCA
-{
-    type ExaCA;
-    libs ("libExaCAFunctionObject.so");
-    
-    box         (0.0005 -0.00025 -0.0002) (0.0015 0.00025 0);
-    dx          2.5e-6;
-    isoValue    1620;
-}
-
-// *********************************************************************** //
diff --git a/tutorials/multiBeam/system/controlDict b/tutorials/multiBeam/system/controlDict
index 1cd9e90..0261ea7 100644
--- a/tutorials/multiBeam/system/controlDict
+++ b/tutorials/multiBeam/system/controlDict
@@ -55,7 +55,27 @@ maxAlphaCo      1;
 
 functions
 {
-    #includeFunc    ExaCA
+    solidificationData
+    {
+        libs ("libadditiveFoamFunctionObjects.so");
+        
+        type solidificationData;
+                
+        box         (-1 -1 -1) (1 1 1);
+        isoValue    1620;
+    }
+/*
+    ExaCA
+    {
+        libs ("libadditiveFoamFunctionObjects.so");
+        
+        type ExaCA;
+                
+        box         (0.0005 -0.00025 -0.0002) (0.0015 0.00025 0);
+        dx          2.5e-6;
+        isoValue    1620;
+    }
+*/
 }
 
 
diff --git a/tutorials/multiLayerPBF/Allclean b/tutorials/multiLayerPBF/Allclean
index 102cc75..8e9b87d 100755
--- a/tutorials/multiLayerPBF/Allclean
+++ b/tutorials/multiLayerPBF/Allclean
@@ -5,12 +5,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-
-rm -rf layer*
-rm -rf constant/scanPath_*
-
 #------------------------------------------------------------------------------
 rm -rf ExaCA/Output*
 rm -rf ExaCA/time-temperature.csv
-#------------------------------------------------------------------------------
 
+rm -rf solidificationData
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiLayerPBF/Allrun b/tutorials/multiLayerPBF/Allrun
index e962c98..d9d41da 100755
--- a/tutorials/multiLayerPBF/Allrun
+++ b/tutorials/multiLayerPBF/Allrun
@@ -16,12 +16,6 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
-if [ "$withExaCA" = true ]; then
-    foamDictionary -entry functions -set "{#includeFunc ExaCA}" system/controlDict
-else
-    foamDictionary -entry functions -set "{}" system/controlDict
-fi
-
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
diff --git a/tutorials/multiLayerPBF/system/ExaCA b/tutorials/multiLayerPBF/system/ExaCA
deleted file mode 100644
index fb9b4c4..0000000
--- a/tutorials/multiLayerPBF/system/ExaCA
+++ /dev/null
@@ -1,19 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Website:  https://openfoam.org
-    \\  /    A nd           | Version:  10
-     \\/     M anipulation  |
-\*---------------------------------------------------------------------------*/
-
-ExaCA
-{
-    type ExaCA;
-    libs ("libExaCAFunctionObject.so");
-    
-    box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
-    dx          2.5e-6;
-    isoValue    1620;
-}
-
-// *********************************************************************** //
diff --git a/tutorials/multiLayerPBF/system/controlDict b/tutorials/multiLayerPBF/system/controlDict
index fe49c27..5d62d8c 100644
--- a/tutorials/multiLayerPBF/system/controlDict
+++ b/tutorials/multiLayerPBF/system/controlDict
@@ -55,7 +55,29 @@ maxAlphaCo      1;
 
 functions
 {
+    solidificationData
+    {
+        libs ("libadditiveFoamFunctionObjects.so");
+        
+        type solidificationData;
+                
+        box         (-1 -1 -1) (1 1 1);
+        isoValue    1620;
+    }
+/*
+    ExaCA
+    {
+        libs ("libadditiveFoamFunctionObjects.so");
+        
+        type ExaCA;
+                
+        box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
+        dx          2.5e-6;
+        isoValue    1620;
+    }
+*/
 }
 
 
+
 // ************************************************************************* //

From 95ee949d5051ab2b35384503bce2dc9a82cb887d Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Fri, 19 Sep 2025 15:33:45 -0400
Subject: [PATCH 2/8] fixup

---
 applications/solvers/additiveFoam/Allwclean                | 2 +-
 applications/solvers/additiveFoam/Allwmake                 | 2 +-
 .../solvers/additiveFoam/functionObjects/ExaCA/Make/files  | 3 ---
 .../additiveFoam/functionObjects/ExaCA/Make/options        | 7 -------
 tutorials/AMB2018-02-B/system/controlDict                  | 1 -
 tutorials/multiBeam/system/controlDict                     | 1 -
 tutorials/multiLayerPBF/system/controlDict                 | 2 --
 7 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 applications/solvers/additiveFoam/functionObjects/ExaCA/Make/files
 delete mode 100644 applications/solvers/additiveFoam/functionObjects/ExaCA/Make/options

diff --git a/applications/solvers/additiveFoam/Allwclean b/applications/solvers/additiveFoam/Allwclean
index 0be4d4a..2cf860f 100755
--- a/applications/solvers/additiveFoam/Allwclean
+++ b/applications/solvers/additiveFoam/Allwclean
@@ -3,7 +3,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 rm -rf Make/gitInfo.H
 
-wclean libso functionObjects/ExaCA
+wclean libso functionObjects
 wclean libso movingHeatSource
 wclean
 
diff --git a/applications/solvers/additiveFoam/Allwmake b/applications/solvers/additiveFoam/Allwmake
index 15956c7..e54e7e1 100755
--- a/applications/solvers/additiveFoam/Allwmake
+++ b/applications/solvers/additiveFoam/Allwmake
@@ -27,7 +27,7 @@ export ADDITIVEFOAM_BUILD_FLAGS="-DGIT_MODULE_ENABLED=1"
 
 #------------------------------------------------------------------------------
 # Build libraries and solver
-wmake $targetType functionObjects/ExaCA
+wmake $targetType functionObjects
 wmake $targetType movingHeatSource
 wmake $targetType
 
diff --git a/applications/solvers/additiveFoam/functionObjects/ExaCA/Make/files b/applications/solvers/additiveFoam/functionObjects/ExaCA/Make/files
deleted file mode 100644
index 79b17f9..0000000
--- a/applications/solvers/additiveFoam/functionObjects/ExaCA/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ExaCA.C
-
-LIB = $(FOAM_USER_LIBBIN)/libExaCAFunctionObject
diff --git a/applications/solvers/additiveFoam/functionObjects/ExaCA/Make/options b/applications/solvers/additiveFoam/functionObjects/ExaCA/Make/options
deleted file mode 100644
index a3ae8da..0000000
--- a/applications/solvers/additiveFoam/functionObjects/ExaCA/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/tutorials/AMB2018-02-B/system/controlDict b/tutorials/AMB2018-02-B/system/controlDict
index fa157c3..2262089 100644
--- a/tutorials/AMB2018-02-B/system/controlDict
+++ b/tutorials/AMB2018-02-B/system/controlDict
@@ -78,5 +78,4 @@ functions
 */
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiBeam/system/controlDict b/tutorials/multiBeam/system/controlDict
index 0261ea7..9b0cf36 100644
--- a/tutorials/multiBeam/system/controlDict
+++ b/tutorials/multiBeam/system/controlDict
@@ -78,5 +78,4 @@ functions
 */
 }
 
-
 // ************************************************************************* //
diff --git a/tutorials/multiLayerPBF/system/controlDict b/tutorials/multiLayerPBF/system/controlDict
index 5d62d8c..f418ce7 100644
--- a/tutorials/multiLayerPBF/system/controlDict
+++ b/tutorials/multiLayerPBF/system/controlDict
@@ -78,6 +78,4 @@ functions
 */
 }
 
-
-
 // ************************************************************************* //

From 32ca09d58b93e25d00af3c8b0ceef114bff8bc1c Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Thu, 9 Oct 2025 16:51:49 -0400
Subject: [PATCH 3/8] fixed logic to enable function options through system
 flags

---
 tutorials/AMB2018-02-B/Allclean            |  4 +-
 tutorials/AMB2018-02-B/Allrun              | 15 ++++++++
 tutorials/AMB2018-02-B/system/controlDict  | 45 ++++++++++++----------
 tutorials/multiBeam/Allclean               |  4 +-
 tutorials/multiBeam/Allrun                 | 14 +++++++
 tutorials/multiBeam/system/controlDict     | 45 ++++++++++++----------
 tutorials/multiLayerPBF/Allclean           |  4 +-
 tutorials/multiLayerPBF/Allrun             | 14 +++++++
 tutorials/multiLayerPBF/system/controlDict | 45 ++++++++++++----------
 9 files changed, 118 insertions(+), 72 deletions(-)

diff --git a/tutorials/AMB2018-02-B/Allclean b/tutorials/AMB2018-02-B/Allclean
index 8e9b87d..915c4c4 100755
--- a/tutorials/AMB2018-02-B/Allclean
+++ b/tutorials/AMB2018-02-B/Allclean
@@ -6,8 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 #------------------------------------------------------------------------------
-rm -rf ExaCA/Output*
-rm -rf ExaCA/time-temperature.csv
-
+rm -rf ExaCA/*.csv
 rm -rf solidificationData
 #------------------------------------------------------------------------------
diff --git a/tutorials/AMB2018-02-B/Allrun b/tutorials/AMB2018-02-B/Allrun
index e2fd29a..cb90d79 100755
--- a/tutorials/AMB2018-02-B/Allrun
+++ b/tutorials/AMB2018-02-B/Allrun
@@ -16,10 +16,25 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
+#------------------------------------------------------------------------------
+# AdditiveFOAM Function Objects
+
+# ExaCA (optional - default: false)
+#export ENABLE_EXACA_DATA=true
+
+# solidificationData (optional - default: false)
+#export ENABLE_SOLIDIFICATION_DATA=true
+
+# force ExaCA functionObject for '-withExaCA' flag
+if [ "$withExaCA" = true ]; then
+    export ENABLE_EXACA_DATA=true
+fi
+
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
 runApplication decomposePar
+
 runParallel $application
 
 runApplication reconstructPar
diff --git a/tutorials/AMB2018-02-B/system/controlDict b/tutorials/AMB2018-02-B/system/controlDict
index 2262089..8ac7666 100644
--- a/tutorials/AMB2018-02-B/system/controlDict
+++ b/tutorials/AMB2018-02-B/system/controlDict
@@ -55,27 +55,30 @@ maxAlphaCo      1;
 
 functions
 {
-    solidificationData
-    {
-        libs ("libadditiveFoamFunctionObjects.so");
-        
-        type solidificationData;
-                
-        box         (-1 -1 -1) (1 1 1);
-        isoValue    1620;
-    }
-/*
-    ExaCA
-    {
-        libs ("libadditiveFoamFunctionObjects.so");
-        
-        type ExaCA;
-                
-        box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
-        dx          2.5e-6;
-        isoValue    1620;
-    }
-*/
+    #ifeq ${ENABLE_SOLIDIFICATION_DATA} true
+        solidificationData
+        {
+            libs ("libadditiveFoamFunctionObjects.so");
+            
+            type solidificationData;
+                    
+            box         (-1 -1 -1) (1 1 1);
+            isoValue    1620;
+        }
+    #endif;
+
+    #ifeq ${ENABLE_EXACA_DATA} true
+        ExaCA
+        {
+            libs ("libadditiveFoamFunctionObjects.so");
+            
+            type ExaCA;
+                    
+            box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
+            dx          2.5e-6;
+            isoValue    1620;
+        }
+    #endif;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiBeam/Allclean b/tutorials/multiBeam/Allclean
index 8e9b87d..915c4c4 100755
--- a/tutorials/multiBeam/Allclean
+++ b/tutorials/multiBeam/Allclean
@@ -6,8 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 #------------------------------------------------------------------------------
-rm -rf ExaCA/Output*
-rm -rf ExaCA/time-temperature.csv
-
+rm -rf ExaCA/*.csv
 rm -rf solidificationData
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiBeam/Allrun b/tutorials/multiBeam/Allrun
index e2fd29a..2afeced 100755
--- a/tutorials/multiBeam/Allrun
+++ b/tutorials/multiBeam/Allrun
@@ -16,6 +16,20 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
+#------------------------------------------------------------------------------
+# AdditiveFOAM Function Objects
+
+# ExaCA (optional - default: false)
+#export ENABLE_EXACA_DATA=true
+
+# solidificationData (optional - default: false)
+#export ENABLE_SOLIDIFICATION_DATA=true
+
+# force ExaCA functionObject for '-withExaCA' flag
+if [ "$withExaCA" = true ]; then
+    export ENABLE_EXACA_DATA=true
+fi
+
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
diff --git a/tutorials/multiBeam/system/controlDict b/tutorials/multiBeam/system/controlDict
index 9b0cf36..066c37d 100644
--- a/tutorials/multiBeam/system/controlDict
+++ b/tutorials/multiBeam/system/controlDict
@@ -55,27 +55,30 @@ maxAlphaCo      1;
 
 functions
 {
-    solidificationData
-    {
-        libs ("libadditiveFoamFunctionObjects.so");
-        
-        type solidificationData;
-                
-        box         (-1 -1 -1) (1 1 1);
-        isoValue    1620;
-    }
-/*
-    ExaCA
-    {
-        libs ("libadditiveFoamFunctionObjects.so");
-        
-        type ExaCA;
-                
-        box         (0.0005 -0.00025 -0.0002) (0.0015 0.00025 0);
-        dx          2.5e-6;
-        isoValue    1620;
-    }
-*/
+    #ifeq ${ENABLE_SOLIDIFICATION_DATA} true
+        solidificationData
+        {
+            libs ("libadditiveFoamFunctionObjects.so");
+            
+            type solidificationData;
+                    
+            box         (-1 -1 -1) (1 1 1);
+            isoValue    1620;
+        }
+    #endif;
+
+    #ifeq ${ENABLE_EXACA_DATA} true
+        ExaCA
+        {
+            libs ("libadditiveFoamFunctionObjects.so");
+            
+            type ExaCA;
+                    
+            box         (0.0005 -0.00025 -0.0002) (0.0015 0.00025 0);
+            dx          2.5e-6;
+            isoValue    1620;
+        }
+    #endif;
 }
 
 // ************************************************************************* //
diff --git a/tutorials/multiLayerPBF/Allclean b/tutorials/multiLayerPBF/Allclean
index 8e9b87d..915c4c4 100755
--- a/tutorials/multiLayerPBF/Allclean
+++ b/tutorials/multiLayerPBF/Allclean
@@ -6,8 +6,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 cleanCase
 #------------------------------------------------------------------------------
-rm -rf ExaCA/Output*
-rm -rf ExaCA/time-temperature.csv
-
+rm -rf ExaCA/*.csv
 rm -rf solidificationData
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiLayerPBF/Allrun b/tutorials/multiLayerPBF/Allrun
index d9d41da..0711fc9 100755
--- a/tutorials/multiLayerPBF/Allrun
+++ b/tutorials/multiLayerPBF/Allrun
@@ -16,6 +16,20 @@ while [ "$#" -gt 0 ]; do
   shift
 done
 
+#------------------------------------------------------------------------------
+# AdditiveFOAM Function Objects
+
+# ExaCA (optional - default: false)
+#export ENABLE_EXACA_DATA=true
+
+# solidificationData (optional - default: false)
+#export ENABLE_SOLIDIFICATION_DATA=true
+
+# force ExaCA functionObject for '-withExaCA' flag
+if [ "$withExaCA" = true ]; then
+    export ENABLE_EXACA_DATA=true
+fi
+
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
diff --git a/tutorials/multiLayerPBF/system/controlDict b/tutorials/multiLayerPBF/system/controlDict
index f418ce7..37c566a 100644
--- a/tutorials/multiLayerPBF/system/controlDict
+++ b/tutorials/multiLayerPBF/system/controlDict
@@ -55,27 +55,30 @@ maxAlphaCo      1;
 
 functions
 {
-    solidificationData
-    {
-        libs ("libadditiveFoamFunctionObjects.so");
-        
-        type solidificationData;
-                
-        box         (-1 -1 -1) (1 1 1);
-        isoValue    1620;
-    }
-/*
-    ExaCA
-    {
-        libs ("libadditiveFoamFunctionObjects.so");
-        
-        type ExaCA;
-                
-        box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
-        dx          2.5e-6;
-        isoValue    1620;
-    }
-*/
+    #ifeq ${ENABLE_SOLIDIFICATION_DATA} true
+        solidificationData
+        {
+            libs ("libadditiveFoamFunctionObjects.so");
+            
+            type solidificationData;
+                    
+            box         (-1 -1 -1) (1 1 1);
+            isoValue    1620;
+        }
+    #endif;
+
+    #ifeq ${ENABLE_EXACA_DATA} true
+        ExaCA
+        {
+            libs ("libadditiveFoamFunctionObjects.so");
+            
+            type ExaCA;
+                    
+            box         (0 -0.0001 -0.0002) (0.002 0.0001 0);
+            dx          2.5e-6;
+            isoValue    1620;
+        }
+    #endif;
 }
 
 // ************************************************************************* //

From 2a160ee874276f78d5c7f574877f3853cea60ab7 Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Fri, 10 Oct 2025 09:36:37 -0400
Subject: [PATCH 4/8] fixup of headers and file reconstruction

---
 .../solvers/additiveFoam/Make/gitInfo.H       | 10 +++
 .../functionObjects/ExaCA/ExaCA.C             |  2 +
 .../solidificationData/solidificationData.C   |  2 +-
 .../AMB2018-02-B/.nfs000000000016ed0900000034 | 52 ++++++++++++++
 tutorials/AMB2018-02-B/Allrun                 | 19 +++--
 tutorials/multiBeam/Allrun                    | 20 ++++--
 .../.nfs000000000018bb6f00000035              | 72 +++++++++++++++++++
 tutorials/multiLayerPBF/Allclean              |  7 +-
 tutorials/multiLayerPBF/Allrun                | 25 +++++--
 9 files changed, 191 insertions(+), 18 deletions(-)
 create mode 100644 applications/solvers/additiveFoam/Make/gitInfo.H
 create mode 100755 tutorials/AMB2018-02-B/.nfs000000000016ed0900000034
 create mode 100755 tutorials/multiLayerPBF/.nfs000000000018bb6f00000035

diff --git a/applications/solvers/additiveFoam/Make/gitInfo.H b/applications/solvers/additiveFoam/Make/gitInfo.H
new file mode 100644
index 0000000..06a3f65
--- /dev/null
+++ b/applications/solvers/additiveFoam/Make/gitInfo.H
@@ -0,0 +1,10 @@
+#ifndef gitInfo_H
+#define gitInfo_H
+
+// Git describe
+#define ADDITIVEFOAM_GIT_DESCRIBE "1.1.0-9-g32ca09d"
+
+// Git hash
+#define ADDITIVEFOAM_GIT_SHA1 "32ca09d58b93e25d00af3c8b0ceef114bff8bc1c"
+
+#endif
diff --git a/applications/solvers/additiveFoam/functionObjects/ExaCA/ExaCA.C b/applications/solvers/additiveFoam/functionObjects/ExaCA/ExaCA.C
index d1cb1ed..f887834 100644
--- a/applications/solvers/additiveFoam/functionObjects/ExaCA/ExaCA.C
+++ b/applications/solvers/additiveFoam/functionObjects/ExaCA/ExaCA.C
@@ -405,6 +405,8 @@ void Foam::functionObjects::ExaCA::interpolate()
         exacaPath + "/" + "data_" + Foam::name(Pstream::myProcNo()) + ".csv"
     );
 
+    os << "x,y,z,tm,ts,cr" << endl;
+
     for(int i=0; i < data.size(); i++)
     {
         int n = data[i].size()-1;
diff --git a/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C b/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C
index 47e589a..dca5d2f 100644
--- a/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C
+++ b/applications/solvers/additiveFoam/functionObjects/solidificationData/solidificationData.C
@@ -201,7 +201,7 @@ bool Foam::functionObjects::solidificationData::end()
        filePath + "/" + "data_" + Foam::name(Pstream::myProcNo()) + ".csv"
     );
     
-    os << "x,y,z,t,R,G,V" << endl;
+    os << "x,y,z,ts,cr,g,v" << endl;
 
     for(int i=0; i < events.size(); i++)
     {
diff --git a/tutorials/AMB2018-02-B/.nfs000000000016ed0900000034 b/tutorials/AMB2018-02-B/.nfs000000000016ed0900000034
new file mode 100755
index 0000000..cb90d79
--- /dev/null
+++ b/tutorials/AMB2018-02-B/.nfs000000000016ed0900000034
@@ -0,0 +1,52 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+application=`getApplication`
+
+# Parse arguments
+withExaCA=false
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    -withExaCA)
+      withExaCA=true
+      ;;
+  esac
+  shift
+done
+
+#------------------------------------------------------------------------------
+# AdditiveFOAM Function Objects
+
+# ExaCA (optional - default: false)
+#export ENABLE_EXACA_DATA=true
+
+# solidificationData (optional - default: false)
+#export ENABLE_SOLIDIFICATION_DATA=true
+
+# force ExaCA functionObject for '-withExaCA' flag
+if [ "$withExaCA" = true ]; then
+    export ENABLE_EXACA_DATA=true
+fi
+
+#------------------------------------------------------------------------------
+# AdditiveFOAM
+runApplication blockMesh
+runApplication decomposePar
+
+runParallel $application
+
+runApplication reconstructPar
+
+#------------------------------------------------------------------------------
+# ExaCA (Version 2.0.1)
+if [ "$withExaCA" = true ]; then
+    echo "x,y,z,tm,ts,cr" > ExaCA/time-temperature.csv
+    cat ExaCA/data_* >> ExaCA/time-temperature.csv
+    rm -rf ExaCA/data_*
+
+    NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
+    mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
+fi
+#------------------------------------------------------------------------------
diff --git a/tutorials/AMB2018-02-B/Allrun b/tutorials/AMB2018-02-B/Allrun
index cb90d79..af30528 100755
--- a/tutorials/AMB2018-02-B/Allrun
+++ b/tutorials/AMB2018-02-B/Allrun
@@ -25,7 +25,7 @@ done
 # solidificationData (optional - default: false)
 #export ENABLE_SOLIDIFICATION_DATA=true
 
-# force ExaCA functionObject for '-withExaCA' flag
+# Enable ExaCA function object for '-withExaCA' flag
 if [ "$withExaCA" = true ]; then
     export ENABLE_EXACA_DATA=true
 fi
@@ -33,6 +33,7 @@ fi
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
+
 runApplication decomposePar
 
 runParallel $application
@@ -40,12 +41,22 @@ runParallel $application
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
-# ExaCA (Version 2.0.1)
-if [ "$withExaCA" = true ]; then
+# Reconstruct function object data
+if [ $ENABLE_EXACA_DATA = true ]; then
     echo "x,y,z,tm,ts,cr" > ExaCA/time-temperature.csv
-    cat ExaCA/data_* >> ExaCA/time-temperature.csv
+    tail -q -n+2 ExaCA/data_* >> ExaCA/time-temperature.csv
     rm -rf ExaCA/data_*
+fi
 
+if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+    echo "x,y,z,ts,cr,g,v" > solidificationData/solidification-data.csv
+    tail -q -n+2 solidificationData/data_* >> solidificationData/solidification-data.csv
+    rm -rf solidificationData/data_*
+fi
+
+#------------------------------------------------------------------------------
+# ExaCA (Version 2.0.1)
+if [ "$withExaCA" = true ]; then
     NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
     mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
 fi
diff --git a/tutorials/multiBeam/Allrun b/tutorials/multiBeam/Allrun
index 2afeced..af30528 100755
--- a/tutorials/multiBeam/Allrun
+++ b/tutorials/multiBeam/Allrun
@@ -25,7 +25,7 @@ done
 # solidificationData (optional - default: false)
 #export ENABLE_SOLIDIFICATION_DATA=true
 
-# force ExaCA functionObject for '-withExaCA' flag
+# Enable ExaCA function object for '-withExaCA' flag
 if [ "$withExaCA" = true ]; then
     export ENABLE_EXACA_DATA=true
 fi
@@ -33,18 +33,30 @@ fi
 #------------------------------------------------------------------------------
 # AdditiveFOAM
 runApplication blockMesh
+
 runApplication decomposePar
+
 runParallel $application
 
 runApplication reconstructPar
 
 #------------------------------------------------------------------------------
-# ExaCA (Version 2.0.1)
-if [ "$withExaCA" = true ]; then
+# Reconstruct function object data
+if [ $ENABLE_EXACA_DATA = true ]; then
     echo "x,y,z,tm,ts,cr" > ExaCA/time-temperature.csv
-    cat ExaCA/data_* >> ExaCA/time-temperature.csv
+    tail -q -n+2 ExaCA/data_* >> ExaCA/time-temperature.csv
     rm -rf ExaCA/data_*
+fi
 
+if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+    echo "x,y,z,ts,cr,g,v" > solidificationData/solidification-data.csv
+    tail -q -n+2 solidificationData/data_* >> solidificationData/solidification-data.csv
+    rm -rf solidificationData/data_*
+fi
+
+#------------------------------------------------------------------------------
+# ExaCA (Version 2.0.1)
+if [ "$withExaCA" = true ]; then
     NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
     mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
 fi
diff --git a/tutorials/multiLayerPBF/.nfs000000000018bb6f00000035 b/tutorials/multiLayerPBF/.nfs000000000018bb6f00000035
new file mode 100755
index 0000000..eaf1731
--- /dev/null
+++ b/tutorials/multiLayerPBF/.nfs000000000018bb6f00000035
@@ -0,0 +1,72 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+application=`getApplication`
+
+# Parse arguments
+withExaCA=false
+while [ "$#" -gt 0 ]; do
+  case "$1" in
+    -withExaCA)
+      withExaCA=true
+      ;;
+  esac
+  shift
+done
+
+#------------------------------------------------------------------------------
+# AdditiveFOAM Function Objects
+
+# ExaCA (optional - default: false)
+#export ENABLE_EXACA_DATA=true
+
+# solidificationData (optional - default: false)
+#export ENABLE_SOLIDIFICATION_DATA=true
+
+# Enable ExaCA function object for '-withExaCA' flag
+if [ "$withExaCA" = true ]; then
+    export ENABLE_EXACA_DATA=true
+fi
+
+#------------------------------------------------------------------------------
+# AdditiveFOAM
+runApplication blockMesh
+
+# Set $ADDITIVEFOAM_INST_DIR path: defaults to $WM_PROJECT_INST_DIR.
+projectDir="${ADDITIVEFOAM_INST_DIR:-$WM_PROJECT_INST_DIR/AdditiveFOAM}"
+path="$projectDir/applications/utilities/multiLayer"
+
+# Create scan paths from constant/createScanPathDict
+createScanPath
+
+$path/runLayers -nLayers 2 -nCellsPerLayer 4 -layerThickness 40e-6
+$path/reconstructLayers
+
+#------------------------------------------------------------------------------
+# Reconstruct function object data
+if [ $ENABLE_EXACA_DATA = true ]; then
+    for d in layer*; do
+        echo "x,y,z,tm,ts,cr" > "$d/ExaCA/time-temperature.csv"
+        tail -q -n+2 "$d/ExaCA/data_"* >> "$d/ExaCA/time-temperature.csv"
+        rm -rf "$d/ExaCA/data_*"
+    done
+fi
+
+if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+    for d in layer*; do    
+        echo "x,y,z,ts,cr,g,v" > "$d/solidificationData/solidification-data.csv"
+        tail -q -n+2 "$d/solidificationData/data_"* >> "$d/solidificationData/solidification-data.csv"
+        rm -rf "$d/solidificationData/data_*"
+    done
+fi
+
+#------------------------------------------------------------------------------
+
+# ExaCA (Version 2.0.1)
+if [ "$withExaCA" = true ]; then    
+    NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
+    mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
+fi
+#------------------------------------------------------------------------------
diff --git a/tutorials/multiLayerPBF/Allclean b/tutorials/multiLayerPBF/Allclean
index 915c4c4..469a5ed 100755
--- a/tutorials/multiLayerPBF/Allclean
+++ b/tutorials/multiLayerPBF/Allclean
@@ -5,7 +5,8 @@ cd ${0%/*} || exit 1    # Run from this directory
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
 cleanCase
-#------------------------------------------------------------------------------
-rm -rf ExaCA/*.csv
-rm -rf solidificationData
+
+rm -rf layer*
+rm -rf constant/scanPath_*
+
 #------------------------------------------------------------------------------
diff --git a/tutorials/multiLayerPBF/Allrun b/tutorials/multiLayerPBF/Allrun
index 0711fc9..c27ec79 100755
--- a/tutorials/multiLayerPBF/Allrun
+++ b/tutorials/multiLayerPBF/Allrun
@@ -25,7 +25,7 @@ done
 # solidificationData (optional - default: false)
 #export ENABLE_SOLIDIFICATION_DATA=true
 
-# force ExaCA functionObject for '-withExaCA' flag
+# Enable ExaCA function object for '-withExaCA' flag
 if [ "$withExaCA" = true ]; then
     export ENABLE_EXACA_DATA=true
 fi
@@ -45,14 +45,27 @@ $path/runLayers -nLayers 2 -nCellsPerLayer 4 -layerThickness 40e-6
 $path/reconstructLayers
 
 #------------------------------------------------------------------------------
-# ExaCA (Version 2.0.1)
-if [ "$withExaCA" = true ]; then
+# Reconstruct function object data to layer directories
+if [ $ENABLE_EXACA_DATA = true ]; then
     for d in layer*; do
         echo "x,y,z,tm,ts,cr" > "$d/ExaCA/time-temperature.csv"
-        cat "$d/ExaCA/data_"* >> "$d/ExaCA/time-temperature.csv"
-        rm -rf "$d/ExaCA/data_*"
+        tail -q -n+2 "$d/ExaCA/data_"* >> "$d/ExaCA/time-temperature.csv"
+        rm -rf "$d/ExaCA/data_"*
+    done
+fi
+
+if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+    for d in layer*; do    
+        echo "x,y,z,ts,cr,g,v" > "$d/solidificationData/solidification-data.csv"
+        tail -q -n+2 "$d/solidificationData/data_"* >> "$d/solidificationData/solidification-data.csv"
+        rm -rf "$d/solidificationData/data_"*
     done
-    
+fi
+
+#------------------------------------------------------------------------------
+
+# ExaCA (Version 2.0.1)
+if [ "$withExaCA" = true ]; then    
     NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
     mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
 fi

From ad3346dfa6ffc808e50c2a9b12c2f1c604b7b6d1 Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Fri, 10 Oct 2025 09:38:25 -0400
Subject: [PATCH 5/8] fixup

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index c381b9a..f602439 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 *.bak
 *.bak[0-9][0-9]
 \#*\#
+*.nfs*
 
 # File-browser settings - anywhere
 .directory
@@ -36,6 +37,7 @@ linux*Icc*/
 solaris*Gcc*/
 SunOS*Gcc*/
 platforms/
+gitInfo.H
 
 # Source packages - anywhere
 *.tar.bz2

From e5345513d5a9987c22084f33428e49464ceb7f34 Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Fri, 10 Oct 2025 09:43:08 -0400
Subject: [PATCH 6/8] cleanup

---
 .../AMB2018-02-B/.nfs000000000016ed0900000034 | 52 --------------
 .../.nfs000000000018bb6f00000035              | 72 -------------------
 2 files changed, 124 deletions(-)
 delete mode 100755 tutorials/AMB2018-02-B/.nfs000000000016ed0900000034
 delete mode 100755 tutorials/multiLayerPBF/.nfs000000000018bb6f00000035

diff --git a/tutorials/AMB2018-02-B/.nfs000000000016ed0900000034 b/tutorials/AMB2018-02-B/.nfs000000000016ed0900000034
deleted file mode 100755
index cb90d79..0000000
--- a/tutorials/AMB2018-02-B/.nfs000000000016ed0900000034
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=`getApplication`
-
-# Parse arguments
-withExaCA=false
-while [ "$#" -gt 0 ]; do
-  case "$1" in
-    -withExaCA)
-      withExaCA=true
-      ;;
-  esac
-  shift
-done
-
-#------------------------------------------------------------------------------
-# AdditiveFOAM Function Objects
-
-# ExaCA (optional - default: false)
-#export ENABLE_EXACA_DATA=true
-
-# solidificationData (optional - default: false)
-#export ENABLE_SOLIDIFICATION_DATA=true
-
-# force ExaCA functionObject for '-withExaCA' flag
-if [ "$withExaCA" = true ]; then
-    export ENABLE_EXACA_DATA=true
-fi
-
-#------------------------------------------------------------------------------
-# AdditiveFOAM
-runApplication blockMesh
-runApplication decomposePar
-
-runParallel $application
-
-runApplication reconstructPar
-
-#------------------------------------------------------------------------------
-# ExaCA (Version 2.0.1)
-if [ "$withExaCA" = true ]; then
-    echo "x,y,z,tm,ts,cr" > ExaCA/time-temperature.csv
-    cat ExaCA/data_* >> ExaCA/time-temperature.csv
-    rm -rf ExaCA/data_*
-
-    NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
-    mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
-fi
-#------------------------------------------------------------------------------
diff --git a/tutorials/multiLayerPBF/.nfs000000000018bb6f00000035 b/tutorials/multiLayerPBF/.nfs000000000018bb6f00000035
deleted file mode 100755
index eaf1731..0000000
--- a/tutorials/multiLayerPBF/.nfs000000000018bb6f00000035
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-application=`getApplication`
-
-# Parse arguments
-withExaCA=false
-while [ "$#" -gt 0 ]; do
-  case "$1" in
-    -withExaCA)
-      withExaCA=true
-      ;;
-  esac
-  shift
-done
-
-#------------------------------------------------------------------------------
-# AdditiveFOAM Function Objects
-
-# ExaCA (optional - default: false)
-#export ENABLE_EXACA_DATA=true
-
-# solidificationData (optional - default: false)
-#export ENABLE_SOLIDIFICATION_DATA=true
-
-# Enable ExaCA function object for '-withExaCA' flag
-if [ "$withExaCA" = true ]; then
-    export ENABLE_EXACA_DATA=true
-fi
-
-#------------------------------------------------------------------------------
-# AdditiveFOAM
-runApplication blockMesh
-
-# Set $ADDITIVEFOAM_INST_DIR path: defaults to $WM_PROJECT_INST_DIR.
-projectDir="${ADDITIVEFOAM_INST_DIR:-$WM_PROJECT_INST_DIR/AdditiveFOAM}"
-path="$projectDir/applications/utilities/multiLayer"
-
-# Create scan paths from constant/createScanPathDict
-createScanPath
-
-$path/runLayers -nLayers 2 -nCellsPerLayer 4 -layerThickness 40e-6
-$path/reconstructLayers
-
-#------------------------------------------------------------------------------
-# Reconstruct function object data
-if [ $ENABLE_EXACA_DATA = true ]; then
-    for d in layer*; do
-        echo "x,y,z,tm,ts,cr" > "$d/ExaCA/time-temperature.csv"
-        tail -q -n+2 "$d/ExaCA/data_"* >> "$d/ExaCA/time-temperature.csv"
-        rm -rf "$d/ExaCA/data_*"
-    done
-fi
-
-if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
-    for d in layer*; do    
-        echo "x,y,z,ts,cr,g,v" > "$d/solidificationData/solidification-data.csv"
-        tail -q -n+2 "$d/solidificationData/data_"* >> "$d/solidificationData/solidification-data.csv"
-        rm -rf "$d/solidificationData/data_*"
-    done
-fi
-
-#------------------------------------------------------------------------------
-
-# ExaCA (Version 2.0.1)
-if [ "$withExaCA" = true ]; then    
-    NPROCS="$(foamDictionary -expand -entry numberOfSubdomains -value system/decomposeParDict)"
-    mpirun -np $NPROCS ~/install/exaca/bin/ExaCA ExaCA/input.json
-fi
-#------------------------------------------------------------------------------

From e69bca81e06a07b90a4c26197f7f7e74ffe19fc1 Mon Sep 17 00:00:00 2001
From: John <colemanjs@ornl.gov>
Date: Fri, 10 Oct 2025 09:46:01 -0400
Subject: [PATCH 7/8] cleanup remove gitInfo.H

---
 applications/solvers/additiveFoam/Make/gitInfo.H | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 applications/solvers/additiveFoam/Make/gitInfo.H

diff --git a/applications/solvers/additiveFoam/Make/gitInfo.H b/applications/solvers/additiveFoam/Make/gitInfo.H
deleted file mode 100644
index 06a3f65..0000000
--- a/applications/solvers/additiveFoam/Make/gitInfo.H
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef gitInfo_H
-#define gitInfo_H
-
-// Git describe
-#define ADDITIVEFOAM_GIT_DESCRIBE "1.1.0-9-g32ca09d"
-
-// Git hash
-#define ADDITIVEFOAM_GIT_SHA1 "32ca09d58b93e25d00af3c8b0ceef114bff8bc1c"
-
-#endif

From ec4515282bbfc501590cd133c327598e2d639fdb Mon Sep 17 00:00:00 2001
From: Gerry Knapp <knappgl@ornl.gov>
Date: Fri, 10 Oct 2025 11:22:53 -0400
Subject: [PATCH 8/8] fixup: minor change for shell portability

---
 .gitignore                     | 2 +-
 tutorials/AMB2018-02-B/Allrun  | 4 ++--
 tutorials/multiBeam/Allrun     | 4 ++--
 tutorials/multiLayerPBF/Allrun | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index f602439..60ab4ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 *.bak
 *.bak[0-9][0-9]
 \#*\#
-*.nfs*
+.nfs*
 
 # File-browser settings - anywhere
 .directory
diff --git a/tutorials/AMB2018-02-B/Allrun b/tutorials/AMB2018-02-B/Allrun
index af30528..9761b16 100755
--- a/tutorials/AMB2018-02-B/Allrun
+++ b/tutorials/AMB2018-02-B/Allrun
@@ -42,13 +42,13 @@ runApplication reconstructPar
 
 #------------------------------------------------------------------------------
 # Reconstruct function object data
-if [ $ENABLE_EXACA_DATA = true ]; then
+if [ "$ENABLE_EXACA_DATA" = true ]; then
     echo "x,y,z,tm,ts,cr" > ExaCA/time-temperature.csv
     tail -q -n+2 ExaCA/data_* >> ExaCA/time-temperature.csv
     rm -rf ExaCA/data_*
 fi
 
-if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+if [ "$ENABLE_SOLIDIFICATION_DATA" = true ]; then
     echo "x,y,z,ts,cr,g,v" > solidificationData/solidification-data.csv
     tail -q -n+2 solidificationData/data_* >> solidificationData/solidification-data.csv
     rm -rf solidificationData/data_*
diff --git a/tutorials/multiBeam/Allrun b/tutorials/multiBeam/Allrun
index af30528..9761b16 100755
--- a/tutorials/multiBeam/Allrun
+++ b/tutorials/multiBeam/Allrun
@@ -42,13 +42,13 @@ runApplication reconstructPar
 
 #------------------------------------------------------------------------------
 # Reconstruct function object data
-if [ $ENABLE_EXACA_DATA = true ]; then
+if [ "$ENABLE_EXACA_DATA" = true ]; then
     echo "x,y,z,tm,ts,cr" > ExaCA/time-temperature.csv
     tail -q -n+2 ExaCA/data_* >> ExaCA/time-temperature.csv
     rm -rf ExaCA/data_*
 fi
 
-if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+if [ "$ENABLE_SOLIDIFICATION_DATA" = true ]; then
     echo "x,y,z,ts,cr,g,v" > solidificationData/solidification-data.csv
     tail -q -n+2 solidificationData/data_* >> solidificationData/solidification-data.csv
     rm -rf solidificationData/data_*
diff --git a/tutorials/multiLayerPBF/Allrun b/tutorials/multiLayerPBF/Allrun
index c27ec79..798db48 100755
--- a/tutorials/multiLayerPBF/Allrun
+++ b/tutorials/multiLayerPBF/Allrun
@@ -46,7 +46,7 @@ $path/reconstructLayers
 
 #------------------------------------------------------------------------------
 # Reconstruct function object data to layer directories
-if [ $ENABLE_EXACA_DATA = true ]; then
+if [ "$ENABLE_EXACA_DATA" = true ]; then
     for d in layer*; do
         echo "x,y,z,tm,ts,cr" > "$d/ExaCA/time-temperature.csv"
         tail -q -n+2 "$d/ExaCA/data_"* >> "$d/ExaCA/time-temperature.csv"
@@ -54,7 +54,7 @@ if [ $ENABLE_EXACA_DATA = true ]; then
     done
 fi
 
-if [ $ENABLE_SOLIDIFICATION_DATA = true ]; then
+if [ "$ENABLE_SOLIDIFICATION_DATA" = true ]; then
     for d in layer*; do    
         echo "x,y,z,ts,cr,g,v" > "$d/solidificationData/solidification-data.csv"
         tail -q -n+2 "$d/solidificationData/data_"* >> "$d/solidificationData/solidification-data.csv"