Commit 1f565e50 authored by mark's avatar mark

ENH: improve coverable of lagrangian types

parent 48a111c5
......@@ -10,6 +10,8 @@ EXE_INC = -DFOAM_PLATFORM="$(WM_ARCH)$(WM_COMPILER)" \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/lagrangian/spray/lnInclude \
-I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-I$(LIB_SRC)/lagrangian/molecularDynamics/molecule/lnInclude \
-I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
......@@ -27,7 +29,8 @@ EXE_INC = -DFOAM_PLATFORM="$(WM_ARCH)$(WM_COMPILER)" \
LIB_LIBS = $(PLIBS) \
$(ADIOS_LIBS) \
${ADIOS_EXTRA_LINK} \
-llagrangian -llagrangianIntermediate \
-llagrangian -llagrangianIntermediate -llagrangianSpray \
-lmolecule \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
-lliquidMixtureProperties -lliquidProperties \
......
......@@ -40,13 +40,13 @@ License
#include "basicKinematicMPPICCloud.H"
#include "basicReactingCloud.H"
#include "basicReactingMultiphaseCloud.H"
// #include "basicSprayCloud.H"
#include "basicSprayCloud.H"
// #include "basicThermoCloud.H"
// #include "coalCloud.H"
// #include "dsmcCloud.H"
#include "indexedParticleCloud.H"
#include "kinematicCloud.H"
// #include "moleculeCloud.H"
#include "moleculeCloud.H"
#include "passiveParticleCloud.H"
// #include "reactingCloud.H"
// #include "reactingMultiphaseCloud.H"
......
......@@ -198,6 +198,22 @@ Foam::label Foam::adiosWrite::writeCloud
}
os << ')'; // closing ')'
// more debugging
if (0)
{
OCompactStringStream dbg(IOstream::BINARY);
dbg << '('; // opening '('
forAllConstIter(typename CloudType, cld, pIter)
{
dbg << *pIter;
break;
}
dbg << ')'; // closing ')'
Pout<< "cloud-stream: " << dbg.str() << endl;
}
writeVariable(varName, iobuffer_);
}
......
......@@ -345,8 +345,22 @@ bool Foam::adiosWrite::readCloudObject
reader, src
);
}
// else if (cloudType == Cloud<basicReactingMultiphaseParcel>::typeName)
// else if (cloudType == Cloud<basicReactingParcel>::typeName)
else if (cloudType == Cloud<basicReactingMultiphaseParcel>::typeName)
{
return cloudRead
(
static_cast<Cloud<basicReactingMultiphaseParcel>&>(obj),
reader, src
);
}
else if (cloudType == Cloud<basicReactingParcel>::typeName)
{
return cloudRead
(
static_cast<Cloud<basicReactingParcel>&>(obj),
reader, src
);
}
// else if (cloudType == Cloud<basicThermoParcel>::typeName)
// else if (cloudType == Cloud<molecule>::typeName)
// else if (cloudType == Cloud<solidParticle>::typeName)
......
......@@ -92,12 +92,44 @@ Foam::label Foam::adiosWrite::writeCloudObject
rInfo
);
}
// else if (cloudType == Cloud<basicReactingMultiphaseParcel>::typeName)
// else if (cloudType == Cloud<basicReactingParcel>::typeName)
else if (cloudType == Cloud<basicReactingMultiphaseParcel>::typeName)
{
nParcels = writeCloud
(
static_cast<const Cloud<basicReactingMultiphaseParcel>&>(obj),
cInfo,
rInfo
);
}
else if (cloudType == Cloud<basicReactingParcel>::typeName)
{
nParcels = writeCloud
(
static_cast<const Cloud<basicReactingParcel>&>(obj),
cInfo,
rInfo
);
}
// else if (cloudType == Cloud<basicThermoParcel>::typeName)
// else if (cloudType == Cloud<molecule>::typeName)
else if (cloudType == Cloud<molecule>::typeName)
{
nParcels = writeCloud
(
static_cast<const Cloud<molecule>&>(obj),
cInfo,
rInfo
);
}
// else if (cloudType == Cloud<solidParticle>::typeName)
// else if (cloudType == Cloud<basicSprayParcel>::typeName)
else if (cloudType == Cloud<basicSprayParcel>::typeName)
{
nParcels = writeCloud
(
static_cast<const Cloud<basicSprayParcel>&>(obj),
cInfo,
rInfo
);
}
return nParcels;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment