diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Diagnostics/ReducedDiags/BeamRelevant.cpp | 12 | ||||
| -rw-r--r-- | Source/Diagnostics/ReducedDiags/FieldEnergy.cpp | 8 | ||||
| -rw-r--r-- | Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp | 6 |
3 files changed, 13 insertions, 13 deletions
diff --git a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp index f5d4feeeb..167d3b095 100644 --- a/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp +++ b/Source/Diagnostics/ReducedDiags/BeamRelevant.cpp @@ -63,7 +63,7 @@ BeamRelevant::BeamRelevant (std::string rd_name) // write header row #if (AMREX_SPACEDIM == 3) ofs << "#"; - ofs << "[1]step"; ofs << m_sep; + ofs << "[1]step()"; ofs << m_sep; ofs << "[2]time(s)"; ofs << m_sep; ofs << "[3]x_mean(m)"; ofs << m_sep; ofs << "[4]y_mean(m)"; ofs << m_sep; @@ -71,33 +71,33 @@ BeamRelevant::BeamRelevant (std::string rd_name) ofs << "[6]px_mean(kg*m/s)"; ofs << m_sep; ofs << "[7]py_mean(kg*m/s)"; ofs << m_sep; ofs << "[8]pz_mean(kg*m/s)"; ofs << m_sep; - ofs << "[9]gamma_mean"; ofs << m_sep; + ofs << "[9]gamma_mean()"; ofs << m_sep; ofs << "[10]x_rms(m)"; ofs << m_sep; ofs << "[11]y_rms(m)"; ofs << m_sep; ofs << "[12]z_rms(m)"; ofs << m_sep; ofs << "[13]px_rms(kg*m/s)"; ofs << m_sep; ofs << "[14]py_rms(kg*m/s)"; ofs << m_sep; ofs << "[15]pz_rms(kg*m/s)"; ofs << m_sep; - ofs << "[16]gamma_rms"; ofs << m_sep; + ofs << "[16]gamma_rms()"; ofs << m_sep; ofs << "[17]emittance_x(m)"; ofs << m_sep; ofs << "[18]emittance_y(m)"; ofs << m_sep; ofs << "[19]emittance_z(m)"; ofs << std::endl; #elif (AMREX_SPACEDIM == 2) ofs << "#"; - ofs << "[1]step"; ofs << m_sep; + ofs << "[1]step()"; ofs << m_sep; ofs << "[2]time(s)"; ofs << m_sep; ofs << "[3]x_mean(m)"; ofs << m_sep; ofs << "[4]z_mean(m)"; ofs << m_sep; ofs << "[5]px_mean(kg*m/s)"; ofs << m_sep; ofs << "[6]py_mean(kg*m/s)"; ofs << m_sep; ofs << "[7]pz_mean(kg*m/s)"; ofs << m_sep; - ofs << "[8]gamma_mean"; ofs << m_sep; + ofs << "[8]gamma_mean()"; ofs << m_sep; ofs << "[9]x_rms(m)"; ofs << m_sep; ofs << "[10]z_rms(m)"; ofs << m_sep; ofs << "[11]px_rms(kg*m/s)"; ofs << m_sep; ofs << "[12]py_rms(kg*m/s)"; ofs << m_sep; ofs << "[13]pz_rms(kg*m/s)"; ofs << m_sep; - ofs << "[14]gamma_rms"; ofs << m_sep; + ofs << "[14]gamma_rms()"; ofs << m_sep; ofs << "[15]emittance_x(m)"; ofs << m_sep; ofs << "[16]emittance_z(m)"; ofs << std::endl; #endif diff --git a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp index 73e6a1c9a..aea4acb29 100644 --- a/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp +++ b/Source/Diagnostics/ReducedDiags/FieldEnergy.cpp @@ -48,20 +48,20 @@ FieldEnergy::FieldEnergy (std::string rd_name) std::ofstream::out | std::ofstream::app); // write header row ofs << "#"; - ofs << "[1]step"; + ofs << "[1]step()"; ofs << m_sep; ofs << "[2]time(s)"; for (int lev = 0; lev < nLevel; ++lev) { ofs << m_sep; ofs << "[" + std::to_string(3+3*lev) + "]"; - ofs << "total(J)lev"+std::to_string(lev); + ofs << "total_lev"+std::to_string(lev)+"(J)"; ofs << m_sep; ofs << "[" + std::to_string(4+3*lev) + "]"; - ofs << "E(J)lev"+std::to_string(lev); + ofs << "E_lev"+std::to_string(lev)+"(J)"; ofs << m_sep; ofs << "[" + std::to_string(5+3*lev) + "]"; - ofs << "B(J)lev"+std::to_string(lev); + ofs << "B_lev"+std::to_string(lev)+"(J)"; } ofs << std::endl; // close file diff --git a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp index 132ad2165..fcafcd7fd 100644 --- a/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp +++ b/Source/Diagnostics/ReducedDiags/ParticleEnergy.cpp @@ -45,7 +45,7 @@ ParticleEnergy::ParticleEnergy (std::string rd_name) std::ofstream::out | std::ofstream::app); // write header row ofs << "#"; - ofs << "[1]step"; + ofs << "[1]step()"; ofs << m_sep; ofs << "[2]time(s)"; ofs << m_sep; @@ -58,12 +58,12 @@ ParticleEnergy::ParticleEnergy (std::string rd_name) } ofs << m_sep; ofs << "[" + std::to_string(4+nSpecies) + "]"; - ofs << "total.mean(J)"; + ofs << "total_mean(J)"; for (int i = 0; i < nSpecies; ++i) { ofs << m_sep; ofs << "[" + std::to_string(5+nSpecies+i) + "]"; - ofs << species_names[i]+".mean(J)"; + ofs << species_names[i]+"_mean(J)"; } ofs << std::endl; // close file |