adjusting step and time for solver diagnostic to be consistent with other reduced diagnostics.

Author: JustinRayAngus

Source/NonlinearSolvers/NewtonSolver.H

@@ -358,12 +358,12 @@ void NewtonSolver<Vec,Ops>::Solve ( Vec&         a_U,
     }
 
     if (!this->m_diagnostic_file.empty() && amrex::ParallelDescriptor::IOProcessor() &&
-        a_step%this->m_diagnostic_interval==0) {
+        ((a_step+1)%this->m_diagnostic_interval==0 || a_step==0)) {
         std::ofstream diagnostic_file{this->m_diagnostic_file, std::ofstream::out | std::ofstream::app};
         diagnostic_file << std::setprecision(14);
-        diagnostic_file << a_step;
+        diagnostic_file << a_step+1;
         diagnostic_file << " ";;
-        diagnostic_file << a_time;
+        diagnostic_file << a_time + a_dt;
         diagnostic_file << " ";;
         diagnostic_file << iter;
         diagnostic_file << " ";;

Source/NonlinearSolvers/PicardSolver.H

@@ -168,7 +168,6 @@ void PicardSolver<Vec,Ops>::Solve ( Vec&         a_U,
     WARPX_ALWAYS_ASSERT_WITH_MESSAGE(
         this->m_is_defined,
         "PicardSolver::Solve() called on undefined object");
-    amrex::ignore_unused(a_dt);
     using namespace amrex::literals;
 
     //
@@ -244,12 +243,12 @@ void PicardSolver<Vec,Ops>::Solve ( Vec&         a_U,
     }
 
     if (!this->m_diagnostic_file.empty() && amrex::ParallelDescriptor::IOProcessor() &&
-        a_step%this->m_diagnostic_interval==0) {
+        (a_step%this->m_diagnostic_interval==0 || a_step==0)) {
         std::ofstream diagnostic_file{this->m_diagnostic_file, std::ofstream::out | std::ofstream::app};
         diagnostic_file << std::setprecision(14);
-        diagnostic_file << a_step;
+        diagnostic_file << a_step+1;
         diagnostic_file << " ";
-        diagnostic_file << a_time;
+        diagnostic_file << a_time + a_dt;
         diagnostic_file << " ";
         diagnostic_file << iter;
         diagnostic_file << " ";