Skip to content

added sim_time_output #58

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

Merged
ScSteffen merged 1 commit into from
Oct 9, 2025
Merged

added sim_time_output #58

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
4 changes: 3 additions & 1 deletion include/common/globalconstants.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ inline std::map<std::string, VOLUME_OUTPUT> VolOutput_Map{
enum SCALAR_OUTPUT {
WALL_TIME,
ITER,
SIM_TIME,
MASS,
RMS_FLUX,
VTK_OUTPUT,
Expand All @@ -202,7 +203,8 @@ enum SCALAR_OUTPUT {
};

inline std::map<std::string, SCALAR_OUTPUT> ScalarOutput_Map{ { "ITER", ITER },
{ "WALL_TIME", WALL_TIME },
{ "WALL_TIME", WALL_TIME },
{ "SIM_TIME", SIM_TIME },
{ "MASS", MASS },
{ "RMS_FLUX", RMS_FLUX },
{ "VTK_OUTPUT", VTK_OUTPUT },
Expand Down
1 change: 1 addition & 0 deletions include/solvers/snsolver_hpc.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class SNSolverHPC
unsigned long _startSysIdx;
unsigned long _endSysIdx;

double _curSimTime;/*!< @brief current in-simulation time after current iteration */
double _currTime; /*!< @brief wall-time after current iteration */
Config* _settings; /*!< @brief config class for global information */
Mesh* _mesh;
Expand Down
20 changes: 12 additions & 8 deletions src/common/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,7 @@ void Config::SetPostprocessing() {
case PROBLEM_Lattice:
legalOutputs = { ITER,
WALL_TIME,
SIM_TIME,
MASS,
RMS_FLUX,
VTK_OUTPUT,
Expand All @@ -780,7 +781,7 @@ void Config::SetPostprocessing() {
ErrorMessages::Error(
"Illegal output field <" + foundKey +
"> for option SCREEN_OUTPUT for this test case.\n"
"Supported fields are: ITER, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, FINAL_TIME_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW, "
"Supported fields are: ITER, SIM_TIME, WALL_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, FINAL_TIME_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW, "
"FINAL_TIME_PARTICLE_ABSORPTION, TOTAL_PARTICLE_ABSORPTION, MAX_PARTICLE_ABSORPTION\n"
"Please check your .cfg file.",
CURRENT_FUNCTION );
Expand All @@ -790,6 +791,7 @@ void Config::SetPostprocessing() {
case PROBLEM_SymmetricHohlraum:
legalOutputs = {
ITER,
SIM_TIME,
WALL_TIME,
MASS,
RMS_FLUX,
Expand All @@ -813,7 +815,7 @@ void Config::SetPostprocessing() {
ErrorMessages::Error(
"Illegal output field <" + foundKey +
"> for option SCREEN_OUTPUT for this test case.\n"
"Supported fields are: ITER, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, TOTAL_PARTICLE_ABSORPTION_CENTER, \n"
"Supported fields are: ITER, SIM_TIME, WALL_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, TOTAL_PARTICLE_ABSORPTION_CENTER, \n"
"TOTAL_PARTICLE_ABSORPTION_VERTICAL, TOTAL_PARTICLE_ABSORPTION_HORIZONTAL, PROBE_MOMENT_TIME_TRACE, CUR_OUTFLOW, \n "
"TOTAL_OUTFLOW, MAX_OUTFLOW, VAR_ABSORPTION_GREEN \n"
"Please check your .cfg file.",
Expand All @@ -822,15 +824,15 @@ void Config::SetPostprocessing() {
break;

default:
legalOutputs = { ITER, WALL_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW };
legalOutputs = { ITER, SIM_TIME, WALL_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW };
it = std::find( legalOutputs.begin(), legalOutputs.end(), _screenOutput[idx_screenOutput] );

if( it == legalOutputs.end() ) {
std::string foundKey = findKey( ScalarOutput_Map, _screenOutput[idx_screenOutput] );
ErrorMessages::Error(
"Illegal output field <" + foundKey +
"> for option SCREEN_OUTPUT for this test case.\n"
"Supported fields are: ITER, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW \n"
"Supported fields are: ITER, SIM_TIME, WALL_TIME, MASS RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW \n"
"Please check your .cfg file.",
CURRENT_FUNCTION );
}
Expand Down Expand Up @@ -909,6 +911,7 @@ void Config::SetPostprocessing() {
case PROBLEM_Lattice:
legalOutputs = { ITER,
WALL_TIME,
SIM_TIME,
MASS,
RMS_FLUX,
VTK_OUTPUT,
Expand All @@ -929,7 +932,7 @@ void Config::SetPostprocessing() {
ErrorMessages::Error(
"Illegal output field <" + foundKey +
"> for option HISTORY_OUTPUT for this test case.\n"
"Supported fields are: ITER, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, FINAL_TIME_OUTFLOW,\n"
"Supported fields are: ITER, SIM_TIME, WALL_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, FINAL_TIME_OUTFLOW,\n"
"TOTAL_OUTFLOW, MAX_OUTFLOW, FINAL_TIME_PARTICLE_ABSORPTION, TOTAL_PARTICLE_ABSORPTION, MAX_PARTICLE_ABSORPTION\n"
"Please check your .cfg file.",
CURRENT_FUNCTION );
Expand All @@ -939,6 +942,7 @@ void Config::SetPostprocessing() {
case PROBLEM_SymmetricHohlraum:
legalOutputs = { ITER,
WALL_TIME,
SIM_TIME,
MASS,
RMS_FLUX,
VTK_OUTPUT,
Expand All @@ -962,7 +966,7 @@ void Config::SetPostprocessing() {
ErrorMessages::Error(
"Illegal output field <" + foundKey +
"> for option HISTORY_OUTPUT for this test case.\n"
"Supported fields are: ITER, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, TOTAL_PARTICLE_ABSORPTION_CENTER, \n "
"Supported fields are: ITER, SIM_TIME, WALL_TIME, MASS RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, TOTAL_PARTICLE_ABSORPTION_CENTER, \n "
"TOTAL_PARTICLE_ABSORPTION_VERTICAL, TOTAL_PARTICLE_ABSORPTION_HORIZONTAL,PROBE_MOMENT_TIME_TRACE, CUR_OUTFLOW, \n"
"TOTAL_OUTFLOW, MAX_OUTFLOW , VAR_ABSORPTION_GREEN, ABSORPTION_GREEN_BLOCK, ABSORPTION_GREEN_LINE \n"
"Please check your .cfg file.",
Expand All @@ -971,15 +975,15 @@ void Config::SetPostprocessing() {
break;

default:
legalOutputs = { ITER, WALL_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW };
legalOutputs = { ITER, WALL_TIME, SIM_TIME, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW };
it = std::find( legalOutputs.begin(), legalOutputs.end(), _historyOutput[idx_historyOutput] );

if( it == legalOutputs.end() ) {
std::string foundKey = findKey( ScalarOutput_Map, _historyOutput[idx_historyOutput] );
ErrorMessages::Error(
"Illegal output field <" + foundKey +
"> for option SCREEN_OUTPUT for this test case.\n"
"Supported fields are: ITER, MASS, RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW \n"
"Supported fields are: ITER, SIM_TIME, WALL_TIME, MASS RMS_FLUX, VTK_OUTPUT, CSV_OUTPUT, CUR_OUTFLOW, TOTAL_OUTFLOW, MAX_OUTFLOW \n"
"Please check your .cfg file.",
CURRENT_FUNCTION );
}
Expand Down
7 changes: 6 additions & 1 deletion src/solvers/snsolver_hpc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ void SNSolverHPC::Solve() {
PrepareVolumeOutput();
DrawPreSolverOutput();
}

_curSimTime = 0.0;
auto start = std::chrono::high_resolution_clock::now(); // Start timing

std::chrono::duration<double> duration;
Expand Down Expand Up @@ -317,6 +317,7 @@ void SNSolverHPC::Solve() {
( _spatialOrder == 2 ) ? FluxOrder2() : FluxOrder1();
FVMUpdate();
}
_curSimTime += _dT;
IterPostprocessing();
// --- Wall time measurement
duration = std::chrono::high_resolution_clock::now() - start;
Expand Down Expand Up @@ -885,6 +886,7 @@ void SNSolverHPC::PrepareScreenOutput() {
switch( _settings->GetScreenOutput()[idx_field] ) {
case MASS: _screenOutputFieldNames[idx_field] = "Mass"; break;
case ITER: _screenOutputFieldNames[idx_field] = "Iter"; break;
case SIM_TIME: _screenOutputFieldNames[idx_field] = "Sim time"; break;
case WALL_TIME: _screenOutputFieldNames[idx_field] = "Wall time [s]"; break;
case RMS_FLUX: _screenOutputFieldNames[idx_field] = "RMS flux"; break;
case VTK_OUTPUT: _screenOutputFieldNames[idx_field] = "VTK out"; break;
Expand Down Expand Up @@ -932,6 +934,7 @@ void SNSolverHPC::WriteScalarOutput( unsigned idx_iter ) {
switch( _settings->GetScreenOutput()[idx_field] ) {
case MASS: _screenOutputFields[idx_field] = _mass; break;
case ITER: _screenOutputFields[idx_field] = idx_iter; break;
case SIM_TIME: _screenOutputFields[idx_field] = _curSimTime; break;
case WALL_TIME: _screenOutputFields[idx_field] = _currTime; break;
case RMS_FLUX: _screenOutputFields[idx_field] = _rmsFlux; break;
case VTK_OUTPUT:
Expand Down Expand Up @@ -986,6 +989,7 @@ void SNSolverHPC::WriteScalarOutput( unsigned idx_iter ) {
switch( _settings->GetHistoryOutput()[idx_field] ) {
case MASS: _historyOutputFields[idx_field] = _mass; break;
case ITER: _historyOutputFields[idx_field] = idx_iter; break;
case SIM_TIME: _screenOutputFields[idx_field] = _curSimTime; break;
case WALL_TIME: _historyOutputFields[idx_field] = _currTime; break;
case RMS_FLUX: _historyOutputFields[idx_field] = _rmsFlux; break;
case VTK_OUTPUT:
Expand Down Expand Up @@ -1131,6 +1135,7 @@ void SNSolverHPC::PrepareHistoryOutput() {
switch( _settings->GetHistoryOutput()[idx_field] ) {
case MASS: _historyOutputFieldNames[idx_field] = "Mass"; break;
case ITER: _historyOutputFieldNames[idx_field] = "Iter"; break;
case SIM_TIME: _historyOutputFieldNames[idx_field] = "Sim_time"; break;
case WALL_TIME: _historyOutputFieldNames[idx_field] = "Wall_time_[s]"; break;
case RMS_FLUX: _historyOutputFieldNames[idx_field] = "RMS_flux"; break;
case VTK_OUTPUT: _historyOutputFieldNames[idx_field] = "VTK_out"; break;
Expand Down