Skip to content

Update preciceDict to comply with upcoming schema changes #354

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Update preciceDict to comply with upcoming schema changes #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
103 changes: 92 additions & 11 deletions Adapter.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,21 +139,102 @@ bool preciceAdapter::Adapter::configFileRead()
}

DEBUG(adapterInfo(" writeData : "));
auto writeData = interfaceDict.lookupOrDefault<wordList>("writeData", wordList());
for (auto writeDatum : writeData)

// Check if writeData is a dictionary or list
ITstream& writeDataStream = interfaceDict.lookup("writeData");
token firstToken = writeDataStream.peek();

if (firstToken == token::BEGIN_BLOCK)
{
const dictionary& writeDataDict = interfaceDict.subDict("writeData");
for (const entry& writeDatumEntry : writeDataDict)
{
const dictionary& writeDatumDict = writeDatumEntry.dict();
word dataName = writeDatumEntry.keyword();

struct fieldConfig fieldConfig;
fieldConfig.name = dataName;
fieldConfig.solver_name = writeDatumDict.lookupOrDefault<word>("solver_name", dataName); // default solver_name is the same
fieldConfig.operation = writeDatumDict.lookupOrDefault<word>("operation", "value"); // default operation is "value"

interfaceConfig.writeData.push_back(fieldConfig);

DEBUG(adapterInfo(" - " + dataName));
DEBUG(adapterInfo(" solver_name: " + fieldConfig.solver_name));
DEBUG(adapterInfo(" operation : " + fieldConfig.operation));
}
}
else if (firstToken == token::BEGIN_LIST)
{

wordList writeDataList = interfaceDict.get<wordList>("writeData");
for (const auto& dataName : writeDataList)
{
struct fieldConfig fieldConfig;
fieldConfig.name = dataName;
fieldConfig.solver_name = dataName;
fieldConfig.operation = "none";

interfaceConfig.writeData.push_back(fieldConfig);

DEBUG(adapterInfo(" - " + dataName));
}
}
else
{
interfaceConfig.writeData.push_back(writeDatum);
DEBUG(adapterInfo(" - " + writeDatum));
adapterInfo("writeData should be a dictionary or a list", "error");
}

DEBUG(adapterInfo(" readData : "));
auto readData = interfaceDict.lookupOrDefault<wordList>("readData", wordList());
for (auto readDatum : readData)

// Check if readData is a dictionary or list
ITstream& readDataStream = interfaceDict.lookup("readData");
firstToken = readDataStream.peek();

if (firstToken == token::BEGIN_BLOCK)
{
const dictionary& readDataDict = interfaceDict.subDict("readData");
for (const entry& readDatumEntry : readDataDict)
{
const dictionary& readDatumDict = readDatumEntry.dict();
word dataName = readDatumEntry.keyword();

struct fieldConfig fieldConfig;
fieldConfig.name = dataName;
fieldConfig.solver_name = readDatumDict.lookupOrDefault<word>("solver_name", dataName); // default solver_name is the same
fieldConfig.operation = readDatumDict.lookupOrDefault<word>("operation", "value"); // default operation is "value"

interfaceConfig.readData.push_back(fieldConfig);

DEBUG(adapterInfo(" - " + dataName));
DEBUG(adapterInfo(" solver_name: " + fieldConfig.solver_name));
DEBUG(adapterInfo(" operation : " + fieldConfig.operation));
}

interfacesConfig_.push_back(interfaceConfig);
}
else if (firstToken == token::BEGIN_LIST)
{

wordList readDataList = interfaceDict.get<wordList>("readData");
for (const auto& dataName : readDataList)
{
struct fieldConfig fieldConfig;
fieldConfig.name = dataName;
fieldConfig.solver_name = dataName;
fieldConfig.operation = "none";

interfaceConfig.readData.push_back(fieldConfig);

DEBUG(adapterInfo(" - " + dataName));
}

interfacesConfig_.push_back(interfaceConfig);
}
else
{
interfaceConfig.readData.push_back(readDatum);
DEBUG(adapterInfo(" - " + readDatum));
adapterInfo("readData should be a dictionary or a list", "error");
}
interfacesConfig_.push_back(interfaceConfig);
}
}
}
Expand Down Expand Up @@ -286,7 +367,7 @@ void preciceAdapter::Adapter::configure()
DEBUG(adapterInfo("Adding coupling data writers..."));
for (uint j = 0; j < interfacesConfig_.at(i).writeData.size(); j++)
{
std::string dataName = interfacesConfig_.at(i).writeData.at(j);
std::string dataName = interfacesConfig_.at(i).writeData.at(j).name;

unsigned int inModules = 0;

Expand Down Expand Up @@ -327,7 +408,7 @@ void preciceAdapter::Adapter::configure()
DEBUG(adapterInfo("Adding coupling data readers..."));
for (uint j = 0; j < interfacesConfig_.at(i).readData.size(); j++)
{
std::string dataName = interfacesConfig_.at(i).readData.at(j);
std::string dataName = interfacesConfig_.at(i).readData.at(j).name;

unsigned int inModules = 0;

Expand Down
12 changes: 10 additions & 2 deletions Adapter.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@ class Adapter
{

private:
//- field options
struct fieldConfig
{
std::string name;
std::string solver_name;
std::string operation;
};

//- Structure of the configuration of each coupling interface.
// Every interface needs to know the coupling mesh, the OpenFOAM
// patches that consist the coupling surface and the kinds
Expand All @@ -42,8 +50,8 @@ private:
bool meshConnectivity;
std::vector<std::string> patchNames;
std::vector<std::string> cellSetNames;
std::vector<std::string> writeData;
std::vector<std::string> readData;
std::vector<struct fieldConfig> writeData;
std::vector<struct fieldConfig> readData;
};

//- Configuration interfaces
Expand Down