Skip to content

Commit 00de3ef

Browse files
Committing clang-format changes
1 parent 1252666 commit 00de3ef

3 files changed

Lines changed: 14 additions & 16 deletions

File tree

packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_CatalystManager.C

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,9 @@ namespace Iocatalyst {
142142
return catPipes[id];
143143
}
144144

145-
bool CatalystManager::setupConduitNodeForCatalystExecute(conduit_cpp::Node &n,
146-
CatalystProps &p, int state, double time, conduit_cpp::Node &data)
145+
bool CatalystManager::setupConduitNodeForCatalystExecute(conduit_cpp::Node &n, CatalystProps &p,
146+
int state, double time,
147+
conduit_cpp::Node &data)
147148
{
148149
if (p.enableCatalystMultiInputPipeline) {
149150
setMultiInputWaitState(p.catalystPipelineID, state, time, data);
@@ -189,7 +190,7 @@ namespace Iocatalyst {
189190
bool returnDueToMultiPipeNotReady = false;
190191

191192
returnDueToMultiPipeNotReady = setupConduitNodeForCatalystExecute(n, p, state, time, data);
192-
if(returnDueToMultiPipeNotReady) {
193+
if (returnDueToMultiPipeNotReady) {
193194
return;
194195
}
195196

packages/seacas/libraries/ioss/src/catalyst/Iocatalyst_CatalystManager.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ namespace Iocatalyst {
104104

105105
CatalystPipelineID initialize(const Ioss::PropertyManager &props,
106106
const Ioss::ParallelUtils &putils);
107-
bool setupConduitNodeForCatalystExecute(conduit_cpp::Node &n,
108-
CatalystProps &p, int state, double time,
109-
conduit_cpp::Node &data);
107+
bool setupConduitNodeForCatalystExecute(conduit_cpp::Node &n, CatalystProps &p, int state,
108+
double time, conduit_cpp::Node &data);
110109
void execute(CatalystPipelineID id, int state, double time, conduit_cpp::Node &data);
111110
void finalize(CatalystPipelineID id);
112111
void addScriptProps(conduit_cpp::Node &n, const CatalystProps &p);

packages/seacas/libraries/ioss/src/catalyst_tests/Iocatalyst_ManagerTest.C

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ TEST_F(ManagerTest, ManagerAddExecuteDataThreeInputs)
569569
TEST_F(ManagerTest, ManagerCallExecuteWithTwoInputsOneScript)
570570
{
571571
reset();
572-
572+
573573
conduit_cpp::Node m1;
574574
std::string m1Channel = "m1";
575575
m1["m1/data"] = 100;
@@ -584,20 +584,19 @@ TEST_F(ManagerTest, ManagerCallExecuteWithTwoInputsOneScript)
584584
props.add(Ioss::Property(CatalystManager::CATALYST_MULTI_INPUT_PIPELINE_NAME, name));
585585
props.add(Ioss::Property(CatalystManager::CATALYST_INPUT_NAME, "inputx"));
586586
initialize();
587-
//CatalystManager::getInstance().setMultiInputWaitState(id, state, time, n);
587+
// CatalystManager::getInstance().setMultiInputWaitState(id, state, time, n);
588588
conduit_cpp::Node m;
589589

590-
591590
Ioss::PropertyManager propsTwo;
592591
propsTwo.add(Ioss::Property(CatalystManager::CATALYST_MULTI_INPUT_PIPELINE_NAME, name));
593592
propsTwo.add(Ioss::Property(CatalystManager::CATALYST_INPUT_NAME, "inputy"));
594593
auto idTwo = CatalystManager::getInstance().initialize(propsTwo, putils);
595594

596-
CatalystManager &catMgr = CatalystManager::getInstance();
597-
auto pppa = catMgr.getCatalystProps(id);
595+
CatalystManager &catMgr = CatalystManager::getInstance();
596+
auto pppa = catMgr.getCatalystProps(id);
598597
conduit_cpp::Node nnna;
599598
catMgr.addExecuteProps(nnna, pppa, state, time);
600-
auto pppb = CatalystManager::getInstance().getCatalystProps(idTwo);
599+
auto pppb = CatalystManager::getInstance().getCatalystProps(idTwo);
601600
conduit_cpp::Node nnnb;
602601
catMgr.addExecuteProps(nnnb, pppb, state, time);
603602
bool returnDueToMultiPipeNotReady = false;
@@ -609,16 +608,15 @@ TEST_F(ManagerTest, ManagerCallExecuteWithTwoInputsOneScript)
609608
std::string datapathb = "catalyst/channels/inputy/data/m2/data";
610609
EXPECT_TRUE(nnnb.has_path(datapatha));
611610
EXPECT_TRUE(nnnb.has_path(datapathb));
612-
if(nnnb.has_path(datapatha) && nnnb.has_path(datapathb)) {
611+
if (nnnb.has_path(datapatha) && nnnb.has_path(datapathb)) {
613612
std::string resa = nnnb[datapatha].to_json();
614613
std::string resb = nnnb[datapathb].to_json();
615-
if((resa != "100") || (resb != "500")) {
614+
if ((resa != "100") || (resb != "500")) {
616615
std::cerr << "ManagerCallExecuteWithTwoInputsOneScript test failing, "
617-
"printing bad conduit node:\n";
616+
"printing bad conduit node:\n";
618617
std::cerr << nnnb.to_json() << "\n";
619618
}
620619
EXPECT_TRUE(resa == "100");
621620
EXPECT_TRUE(resb == "500");
622621
}
623622
}
624-

0 commit comments

Comments
 (0)