OpenFOAM: v1912 released! - For more information see https://www.openfoam.com/releases/openfoam-v1912

Commit aa2c8a2c authored by Mark Olesen's avatar Mark Olesen

COMP: update to compile with OpenFOAM-v1906

parent fe23642b
......@@ -15,13 +15,13 @@ ThirdParty
Until this is fully integrated into OpenFOAM, the user should compile
ADIOS using the ThirdParty `makeADIOS` script with the preferred ADIOS version.
Subsequently, set `ADIOS_ARCH_PATH` accordingly. Eg,
Subsequently, set `ADIOS1_ARCH_PATH` accordingly. Eg,
adios_version=ADIOS-1.11.0
export ADIOS_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
export ADIOS1_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$adios_version
And optionally add it to the PATH
PATH=$ADIOS_ARCH_PATH/bin:$PATH
PATH=$ADIOS1_ARCH_PATH/bin:$PATH
---
......@@ -18,7 +18,7 @@
* Storage directory: "adiosData/"
* Each "ofbp" (OpenFOAM binary packed) adios file is restricted to a
* Each "bp" (OpenFOAM binary packed) adios file is restricted to a
***single*** time-step/iteration.
This makes for simple and efficient handling.
......
......@@ -48,7 +48,7 @@ const Foam::word
Foam::adiosCore::dataDirectory("adiosData");
const Foam::word
Foam::adiosCore::fileExt("ofbp");
Foam::adiosCore::fileExt("bp");
const Foam::string
Foam::adiosCore::foamAttribute = "/openfoam";
......
......@@ -454,7 +454,7 @@ bool Foam::adiosReader::readIntListAttributeIfPresent
if (ok)
{
if (type == adios_integer || adios_unsigned_integer)
if (type == adios_integer || type == adios_unsigned_integer)
{
// we don't distinguish between signed/unsigned
// mostly just use signed anyhow
......
......@@ -42,6 +42,10 @@ Description
namespace Foam
{
// Forward declarations
class ParcelEncoding;
Ostream& operator<<(Ostream& os, const ParcelEncoding& lst);
/*---------------------------------------------------------------------------*\
Class ParcelEncoding Declaration
\*---------------------------------------------------------------------------*/
......
......@@ -43,11 +43,13 @@ Description
namespace Foam
{
// forward declaration
class ParcelEncoding;
template<class Type>
class ParcelEncodingAccessor;
// Forward declaration
class ParcelEncoding;
class ParcelEncodingFragment;
template<class Type> class ParcelEncodingAccessor;
Ostream& operator<<(Ostream& os, const ParcelEncodingFragment& frag);
/*---------------------------------------------------------------------------*\
......
......@@ -137,6 +137,9 @@ public:
Class OAnalyzeStreamAllocator Declaration
\*---------------------------------------------------------------------------*/
namespace Detail
{
//- An stream/stream-buffer allocator for counting
class OAnalyzeStreamAllocator
{
......@@ -188,6 +191,8 @@ public:
}
};
// End namespace Detail
/*---------------------------------------------------------------------------*\
Class OAnalyzeStream Declaration
......@@ -196,10 +201,10 @@ public:
//- An output stream for reporting bytes seen
class OAnalyzeStream
:
public OAnalyzeStreamAllocator,
public Detail::OAnalyzeStreamAllocator,
public OSstream
{
typedef OAnalyzeStreamAllocator allocator_type;
typedef Detail::OAnalyzeStreamAllocator allocator_type;
public:
......@@ -251,10 +256,10 @@ public:
//- An output stream for reporting bytes seen, compact output
class OAnalyzeCompactStream
:
public OAnalyzeStreamAllocator,
public Detail::OAnalyzeStreamAllocator,
public OCompactStream
{
typedef OAnalyzeStreamAllocator allocator_type;
typedef Detail::OAnalyzeStreamAllocator allocator_type;
public:
......
......@@ -43,7 +43,6 @@ Foam::OCompactStream::OCompactStream
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
Foam::Ostream& Foam::OCompactStream::writeKeyword(const keyType& kw)
{
write(kw);
......
......@@ -99,7 +99,6 @@ public:
//- Add newline and flush stream
virtual void endl();
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -47,10 +47,10 @@ namespace Foam
class OCountCompactStream
:
public OCountStreamAllocator,
public Detail::OCountStreamAllocator,
public OCompactStream
{
typedef OCountStreamAllocator allocator_type;
typedef Detail::OCountStreamAllocator allocator_type;
public:
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2017 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -46,10 +46,10 @@ namespace Foam
class OStringCompactStream
:
public StringStreamAllocator<std::ostringstream>,
public Detail::StringStreamAllocator<std::ostringstream>,
public OCompactStream
{
typedef StringStreamAllocator<std::ostringstream> allocator_type;
typedef Detail::StringStreamAllocator<std::ostringstream> allocator_type;
public:
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016-2107 OpenCFD Ltd.
\\ / A nd | Copyright (C) 2016-2019 OpenCFD Ltd.
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -47,10 +47,10 @@ namespace Foam
//- An Ostream with an attached external buffer and compact output
class UOListCompactStream
:
public UOListAllocator,
public Detail::UOListStreamAllocator,
public OCompactStream
{
typedef UOListAllocator allocator_type;
typedef Detail::UOListStreamAllocator allocator_type;
public:
......
......@@ -4,8 +4,8 @@ sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
/* Obtain compile/link flags via adios_config */
ADIOS_INC := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -c)
ADIOS_LIBS := $(shell $(ADIOS_ARCH_PATH)/bin/adios_config -l)
ADIOS_INC := $(shell $(ADIOS1_ARCH_PATH)/bin/adios_config -c)
ADIOS_LIBS := $(shell $(ADIOS1_ARCH_PATH)/bin/adios_config -l)
EXE_INC = \
......
......@@ -49,23 +49,24 @@ void Foam::adiosWrite::regionInfo::read
explicitWrite_.readIfPresent("explicit", wrtDict);
expandCloud_.readIfPresent("expandCloud", wrtDict);
if (explicitWrite_ || wrtDict.found("fields"))
{
wrtDict.lookup("fields") >> requestedFields_;
}
if (explicitWrite_ || wrtDict.found("clouds"))
{
wrtDict.lookup("clouds") >> requestedClouds_;
}
wrtDict.readEntry
(
"fields",
requestedFields_,
keyType::LITERAL,
explicitWrite_
);
if (ignDict.found("fields"))
{
ignDict.lookup("fields") >> ignoredFields_;
}
if (ignDict.found("clouds"))
{
ignDict.lookup("clouds") >> ignoredClouds_;
}
wrtDict.readEntry
(
"clouds",
requestedClouds_,
keyType::LITERAL,
explicitWrite_
);
ignDict.readIfPresent("fields", ignoredFields_);
ignDict.readIfPresent("clouds", ignoredClouds_);
// Check if the requested fields are actually accessible
DynamicList<word> missing(requestedFields_.size());
......@@ -147,12 +148,12 @@ bool Foam::adiosWrite::regionInfo::acceptCloudObject
return
(
// clouds only and not explicitly ignored
isA<cloud>(obj) && !findStrings(ignoredClouds_, name)
isA<cloud>(obj) && !ignoredClouds_.match(name)
&&
(
// auto-write or explicitly requested
(autoWrite() && obj.writeOpt() == IOobject::AUTO_WRITE)
|| findStrings(requestedClouds_, name)
|| requestedClouds_.match(name)
)
);
}
......@@ -168,12 +169,12 @@ bool Foam::adiosWrite::regionInfo::acceptFieldObject
return
(
// NO clouds and not explicitly ignored
!isA<cloud>(obj) && !findStrings(ignoredFields_, name)
!isA<cloud>(obj) && !ignoredFields_.match(name)
&&
(
// auto-write or explicitly requested
(autoWrite() && obj.writeOpt() == IOobject::AUTO_WRITE)
|| findStrings(requestedFields_, name)
|| requestedFields_.match(name)
)
&& !name.endsWith("_0") // ignore _0 fields
);
......
......@@ -264,7 +264,7 @@ bool Foam::adiosWrite::read(const dictionary& dict)
const entry& e = iter();
const word& regName = e.keyword();
if (!regionNames.contains(regName))
if (!regionNames.found(regName))
{
warn[nwarn++] = regName;
}
......@@ -347,7 +347,7 @@ bool Foam::adiosWrite::read(const dictionary& dict)
else if (when == "restartTime")
{
restartFrom_ = restartTime;
dict.lookup("restartTime") >> restartTime_;
dict.readEntry("restartTime", restartTime_);
Info<< type() << " " << adiosCore::name()
<< " : Restart requested, Time = " << restartTime_ << endl;
......@@ -388,7 +388,7 @@ bool Foam::adiosWrite::read(const dictionary& dict)
else if (when == "stopTime")
{
stopAt_ = stopTime;
dict.lookup("stopTime") >> stopTime_;
dict.readEntry("stopTime", stopTime_);
Info<< type() << " " << adiosCore::name()
<< " : Stop requested, Time = " << stopTime_ << endl;
......
......@@ -281,10 +281,10 @@ class adiosWrite::regionInfo
Switch explicitWrite_;
//- Names of volume fields to write
wordReList requestedFields_;
wordRes requestedFields_;
//- Names of volume fields to ignore
wordReList ignoredFields_;
wordRes ignoredFields_;
// track changes to mesh status (points/faces)
......@@ -311,10 +311,10 @@ class adiosWrite::regionInfo
public:
//- Names of clouds to write
wordReList requestedClouds_;
wordRes requestedClouds_;
//- Names of clouds to ignored
wordReList ignoredClouds_;
wordRes ignoredClouds_;
//- Normally don't want to expand cloud (debug only)
Switch expandCloud_;
......@@ -335,8 +335,7 @@ public:
);
~regionInfo()
{}
~regionInfo() = default;
//- If auto-write is in effect
......
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