Skip to content

Commit

Permalink
Formatting and loose changes removed idaholab#12722
Browse files Browse the repository at this point in the history
  • Loading branch information
socratesgorilla committed Jan 19, 2023
1 parent c51ef42 commit 48c7c13
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion framework/src/base/MooseApp.C
Original file line number Diff line number Diff line change
Expand Up @@ -1579,7 +1579,7 @@ MooseApp::getCheckpointDirectories() const

// Add the directories added with Outputs/checkpoint=true input syntax
checkpoint_dirs.push_back(getOutputFileBase() + "_cp");
// the private variable doesnt contain _out at the end.
// the private variable doesnt contain _out at the end.
checkpoint_dirs.push_back(_output_file_base + "_autosave_cp");

// Add the directories from any existing checkpoint output objects
Expand Down
4 changes: 2 additions & 2 deletions framework/src/outputs/Checkpoint.C
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ Checkpoint::updateCheckpointFiles(CheckpointFileNames file_struct)
int ret = remove(file_name.c_str());
if (ret != 0)
mooseWarning("Error during the deletion of file '", file_name, "': ", std::strerror(ret));

}
}

}
1 change: 0 additions & 1 deletion framework/src/problems/FEProblemBase.C
Original file line number Diff line number Diff line change
Expand Up @@ -7586,7 +7586,6 @@ FEProblemBase::addOutput(const std::string & object_type,
const std::string & object_name,
InputParameters & parameters)
{
std::cout << "got to output" << std::endl;
// Get a reference to the OutputWarehouse
OutputWarehouse & output_warehouse = _app.getOutputWarehouse();

Expand Down
1 change: 0 additions & 1 deletion framework/src/userobject/SideUserObject.C
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ SideUserObject::SideUserObject(const InputParameters & parameters)
const std::vector<MooseVariableFEBase *> & coupled_vars = getCoupledMooseVars();
for (const auto & var : coupled_vars)
addMooseVariableDependency(var);
std::cout << SIGINT;
}

void
Expand Down
3 changes: 1 addition & 2 deletions framework/src/userobject/Terminator.C
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "MooseApp.h"
#include "MooseEnum.h"
#include "Executioner.h"
#include <csignal>

registerMooseObject("MooseApp", Terminator);

InputParameters
Expand Down Expand Up @@ -83,7 +83,6 @@ Terminator::Terminator(const InputParameters & parameters)
_pp_values[i] = &getPostprocessorValueByName(_pp_names[i]);

_params.resize(_pp_num);
std::raise(SIGINT);
}

void
Expand Down
1 change: 1 addition & 0 deletions framework/src/utils/MooseUtils.C
Original file line number Diff line number Diff line change
Expand Up @@ -1362,6 +1362,7 @@ getLatestCheckpointFileHelper(const std::list<std::string> & checkpoint_files,
max_base.clear();
max_file.clear();
}

return keep_extension ? max_file : max_base;
}

Expand Down
3 changes: 2 additions & 1 deletion python/TestHarness/testers/SignalTester.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ def __init__(self, name, params):
def check_signal(self,pid):
#wait for 3 seconds for the output to start, then send the SIGUSR1 signal to the program
time.sleep(3)
os.kill(pid, signal.SIGUSR1)
os.kill(pid, signal.SIGUSR1)

2 changes: 1 addition & 1 deletion python/TestHarness/testers/Tester.py
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def runCommand(self, cmd, cwd, timer, options):
self.outfile = f
self.errfile = e


timer.start()
self.check_signal(process.pid)
process.wait()
Expand Down
3 changes: 2 additions & 1 deletion test/src/main.C
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "Moose.h"
#include "AppFactory.h"

#include <iostream>
// Create a performance log
PerfLog Moose::perf_log("Moose Test");

Expand All @@ -32,4 +33,4 @@ main(int argc, char * argv[])
app->run();

return 0;
}
}

0 comments on commit 48c7c13

Please sign in to comment.