Corrected solver names, removed unnecessary/commented code

christuart · Jul 30, 2017 · 088e686 · 088e686
1 parent 4b0169d
commit 088e686
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 214 deletions.
diff --git a/.gitignore b/.gitignore
@@ -40,3 +40,6 @@ SiCortex*Gcc*/
 solaris*Gcc*/
 SunOS*Gcc*/
 platforms/
+
+# runtime log files
+*.log
diff --git a/solvers/tDecayFoam/createFields.H b/solvers/tDecayFoam/createFields.H
@@ -12,12 +12,6 @@ IOdictionary transportProperties
     )
 );
 
-dimensionedScalar nu
-(
-    "nu",
-    dimViscosity,
-    transportProperties.lookup("nu")
-);
 dimensionedScalar D
 (
     "D",
@@ -31,21 +25,6 @@ dimensionedScalar lambda
     transportProperties.lookup("lambda")
 );
 
-Info<< "Reading field p\n" << endl;
-/*volScalarField p
-(
-    IOobject
-    (
-        "p",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-*/
-
 Info<< "Reading field T\n" << endl;
 volScalarField T
 (
@@ -59,53 +38,3 @@ volScalarField T
     ),
     mesh
 );
-Info<< "Reading field kappaEff\n" << endl;
-volScalarField kappaEff
-(
-    IOobject
-    (
-        "kappaEff",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-/*
-Info<< "Reading field U\n" << endl;
-volVectorField V
-(
-    IOobject
-    (
-        "V",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-
-//#include "createPhi.H"
-
-surfaceScalarField phi
-(
-    IOobject
-    (
-        "phi",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    fvc::flux(V)
-);
-*/
-
-label TRefCell = 0;
-scalar TRefValue = 1.0;
-setRefCell(T, mesh.solutionDict().subDict("SIMPLE"), TRefCell, TRefValue);
-mesh.setFluxRequired(T.name());
diff --git a/solvers/tDecayFoam/tDecayFoam.C b/solvers/tDecayFoam/tDecayFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    icoTempFoam
+    tDecayFoam
 
 Description
     Transient solver for incompressible, laminar flow of Newtonian fluids.
@@ -40,10 +40,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
 
-    //simpleControl simple(mesh);
-
     #include "createFields.H"
-    //#include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,33 +50,19 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        //#include "CourantNo.H"
-
-
-        // --- PISO loop
-        //while (simple.correctNonOrthogonal())
         {
-            Info << "Running the solver loop!!!" << endl;
-            //#include "continuityErrs.H"
             fvScalarMatrix TEqn
             (
                 fvm::ddt(T)
               + lambda*T
               - fvm::laplacian(D, T)
             );
-            Info << "Got past the definition of TEqn" << endl;
 
             TEqn.relax();
 
-            Info << "Relaxed TEqn" << endl;
-
             solve(TEqn);
 
-            Info << "Solved TEqn" << endl;
-
             T.correctBoundaryConditions();
-
-            Info << "Corrected boundary conditions for T" << endl;
         }
 
         runTime.write();

diff --git a/solvers/tDiffFoam/createFields.H b/solvers/tDiffFoam/createFields.H
@@ -12,34 +12,13 @@ IOdictionary transportProperties
     )
 );
 
-dimensionedScalar nu
-(
-    "nu",
-    dimViscosity,
-    transportProperties.lookup("nu")
-);
 dimensionedScalar D
 (
     "D",
     dimViscosity,
     transportProperties.lookup("D")
 );
 
-Info<< "Reading field p\n" << endl;
-/*volScalarField p
-(
-    IOobject
-    (
-        "p",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-*/
-
 Info<< "Reading field T\n" << endl;
 volScalarField T
 (
@@ -53,53 +32,3 @@ volScalarField T
     ),
     mesh
 );
-Info<< "Reading field kappaEff\n" << endl;
-volScalarField kappaEff
-(
-    IOobject
-    (
-        "kappaEff",
-        runTime.timeName(),
-        mesh,
-        IOobject::MUST_READ,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-/*
-Info<< "Reading field U\n" << endl;
-volVectorField V
-(
-    IOobject
-    (
-        "V",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    mesh
-);
-
-
-//#include "createPhi.H"
-
-surfaceScalarField phi
-(
-    IOobject
-    (
-        "phi",
-        runTime.timeName(),
-        mesh,
-        IOobject::READ_IF_PRESENT,
-        IOobject::AUTO_WRITE
-    ),
-    fvc::flux(V)
-);
-*/
-
-label TRefCell = 0;
-scalar TRefValue = 1.0;
-setRefCell(T, mesh.solutionDict().subDict("SIMPLE"), TRefCell, TRefValue);
-mesh.setFluxRequired(T.name());
diff --git a/solvers/tDiffFoam/tDiffFoam.C b/solvers/tDiffFoam/tDiffFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    icoTempFoam
+    tDiffFoam
 
 Description
     Transient solver for incompressible, laminar flow of Newtonian fluids.
@@ -40,10 +40,7 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
 
-    //simpleControl simple(mesh);
-
     #include "createFields.H"
-    //#include "initContinuityErrs.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,32 +50,18 @@ int main(int argc, char *argv[])
     {
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
-        //#include "CourantNo.H"
-
-
-        // --- PISO loop
-        //while (simple.correctNonOrthogonal())
         {
-            Info << "Running the solver loop!!!" << endl;
-            //#include "continuityErrs.H"
             fvScalarMatrix TEqn
             (
                 fvm::ddt(T)
               - fvm::laplacian(D, T)
             );
-            Info << "Got past the definition of TEqn" << endl;
 
             TEqn.relax();
 
-            Info << "Relaxed TEqn" << endl;
-
             solve(TEqn);
 
-            Info << "Solved TEqn" << endl;
-
             T.correctBoundaryConditions();
-
-            Info << "Corrected boundary conditions for T" << endl;
         }
 
         runTime.write();

diff --git a/solvers/tRegionDecayFoam/createFields.H b/solvers/tRegionDecayFoam/createFields.H
@@ -46,8 +46,3 @@ volScalarField T
     ),
     mesh
 );
-
-label TRefCell = 0;
-scalar TRefValue = 1.0;
-setRefCell(T, mesh.solutionDict().subDict("SIMPLE"), TRefCell, TRefValue);
-mesh.setFluxRequired(T.name());
diff --git a/solvers/tRegionFoam/createFields.H b/solvers/tRegionFoam/createFields.H
@@ -25,9 +25,3 @@ volScalarField T
     ),
     mesh
 );
-
-
-label TRefCell = 0;
-scalar TRefValue = 1.0;
-setRefCell(T, mesh.solutionDict().subDict("SIMPLE"), TRefCell, TRefValue);
-mesh.setFluxRequired(T.name());
diff --git a/solvers/tThermDecayFoam/createFields.H b/solvers/tThermDecayFoam/createFields.H
@@ -137,8 +137,3 @@ volScalarField T
     ),
     mesh
 );
-
-label C_TRefCell = 0;
-scalar C_TRefValue = 1.0;
-setRefCell(C_T, mesh.solutionDict().subDict("SIMPLE"), C_TRefCell, C_TRefValue);
-mesh.setFluxRequired(C_T.name());
diff --git a/solvers/tThermDecayFoam/tThermDecayFoam.C b/solvers/tThermDecayFoam/tThermDecayFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    tVaryDecayFoam
+    tThermDecayFoam
 
 Description
     Transient solver for multi-zone tritium diffusion and radioactive decay,

diff --git a/solvers/tThermFoam/createFields.H b/solvers/tThermFoam/createFields.H
@@ -118,8 +118,3 @@ volScalarField T
     ),
     mesh
 );
-
-label C_TRefCell = 0;
-scalar C_TRefValue = 1.0;
-setRefCell(C_T, mesh.solutionDict().subDict("SIMPLE"), C_TRefCell, C_TRefValue);
-mesh.setFluxRequired(C_T.name());
diff --git a/solvers/tThermFoam/tThermFoam.C b/solvers/tThermFoam/tThermFoam.C
@@ -22,7 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    tVaryDecayFoam
+    tThermFoam
 
 Description
     Transient solver for multi-zone tritium diffusion and radioactive decay,

diff --git a/solvers/tVaryDecayFoam/createFields.H b/solvers/tVaryDecayFoam/createFields.H
@@ -88,8 +88,3 @@ volScalarField T
     ),
     mesh
 );
-
-label C_TRefCell = 0;
-scalar C_TRefValue = 1.0;
-setRefCell(C_T, mesh.solutionDict().subDict("SIMPLE"), C_TRefCell, C_TRefValue);
-mesh.setFluxRequired(C_T.name());
diff --git a/solvers/tVaryFoam/createFields.H b/solvers/tVaryFoam/createFields.H
@@ -70,7 +70,7 @@ volScalarField T
     mesh
 );
 
-Info<< "Reading flux tracking fields store and flux\n" << endl;
+Info<< "Making flux tracking fields store and flux\n" << endl;
 volScalarField store
 (
     IOobject
@@ -97,8 +97,3 @@ volScalarField flux
     mesh,
     dimensionedScalar("flux", dimless, 0.0)
 );
-
-label C_TRefCell = 0;
-scalar C_TRefValue = 1.0;
-setRefCell(C_T, mesh.solutionDict().subDict("SIMPLE"), C_TRefCell, C_TRefValue);
-mesh.setFluxRequired(C_T.name());
diff --git a/solvers/tVaryFoam/tVaryFoam.C b/solvers/tVaryFoam/tVaryFoam.C
@@ -33,8 +33,6 @@ Description
 #include "fvCFD.H"
 #include "simpleControl.H"
 #include "tritiumGradientFvPatchScalarField.H"
-//#include "GeometricField.H"
-//#include "GeometricBoundaryField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //