corrected saving and eval of fields over time

This commit is contained in:
Vasco C. B. Ferreira
2026-06-26 11:40:10 +02:00
parent 26d0637987
commit 006bd19fe2
10 changed files with 373 additions and 403 deletions
+44 -52
View File
@@ -1,22 +1,18 @@
#include "nufi/save_results.h"
#include "nufi/fields.h"
#include "nufi/nufi_solver.h"
#include "nufi/parameters.h"
#include "nufi/poisson_problem.h"
#include <fstream>
#include <stdexcept>
#include <string>
#include <vector>
#include "nufi/nufi_solver.h"
#include "nufi/poisson_problem.h"
#include "nufi/fields.h"
void save_f( const NuFISolver &solver,
unsigned int n,
const PoissonProblem<1> &poisson,
unsigned int Nx_out,
unsigned int Nv_out,
const std::string &filename)
{
void save_f(const NuFISolver &solver, unsigned int n,
const PoissonProblem<1> &poisson,
const std::vector<Vector<double>> &phi_history, unsigned int Nx_out,
unsigned int Nv_out, const std::string &filename) {
std::ofstream file(filename);
double xmin = Parameters::X_DOMAIN_LEFT;
@@ -32,34 +28,30 @@ void save_f( const NuFISolver &solver,
file << xmin << " " << xmax << "\n";
file << vmin << " " << vmax << "\n";
for (unsigned int i = 0; i < Nx_out; ++i)
{
double x = xmin + (i + 0.5)*dx;
for (unsigned int i = 0; i < Nx_out; ++i) {
double x = xmin + (i + 0.5) * dx;
for (unsigned int j = 0; j < Nv_out; ++j)
{
double v = vmin + (j + 0.5)*dv;
for (unsigned int j = 0; j < Nv_out; ++j) {
double v = vmin + (j + 0.5) * dv;
double val = solver.eval_f(n, x, v, poisson);
double val = solver.eval_f(n, x, v, poisson, phi_history);
file << val;
file << val;
if (j < Nv_out - 1)
file << " ";
}
if (j < Nv_out - 1)
file << " ";
}
file << "\n";
file << "\n";
}
file.close();
}
void save_rho(const NuFISolver &solver,
unsigned int n,
const PoissonProblem<1> &poisson,
unsigned int Nx_out,
const std::string &filename)
{
void save_rho(const NuFISolver &solver, unsigned int n,
const PoissonProblem<1> &poisson,
const std::vector<Vector<double>> &phi_history,
unsigned int Nx_out, const std::string &filename) {
std::ofstream file(filename);
double xmin = Parameters::X_DOMAIN_LEFT;
@@ -69,20 +61,18 @@ void save_rho(const NuFISolver &solver,
file << Nx_out << "\n";
file << xmin << " " << xmax << "\n";
for (unsigned int i = 0; i < Nx_out; ++i, xmin += dx)
{
double val = solver.eval_rho(n, xmin, poisson);
file << val;
file << "\n";
for (unsigned int i = 0; i < Nx_out; ++i, xmin += dx) {
double val = solver.eval_rho(n, xmin, poisson, phi_history);
file << val;
file << "\n";
}
file.close();
}
void save_Efield([[maybe_unused]]unsigned int n,
const PoissonProblem<1> &poisson,
unsigned int Nx_out,
const std::string &filename)
{
void save_Efield([[maybe_unused]] unsigned int n,
const PoissonProblem<1> &poisson,
const std::vector<Vector<double>> &phi_history,
unsigned int Nx_out, const std::string &filename) {
std::ofstream file(filename);
double xmin = Parameters::X_DOMAIN_LEFT;
@@ -94,23 +84,25 @@ void save_Efield([[maybe_unused]]unsigned int n,
file << Nx_out << "\n";
file << xmin << " " << xmax << "\n";
for (unsigned int i = 0; i < Nx_out; ++i, xmin += dx)
{
double val = -eval(xmin, poisson);
file << val;
file << "\n";
for (unsigned int i = 0; i < Nx_out; ++i, xmin += dx) {
double val = -eval(xmin, poisson, phi_history[n]);
file << val;
file << "\n";
}
file.close();
}
void save_space_vector(const std::vector<double>& vals, const std::string& filename, size_t it)
{
std::ofstream file("results/" + filename + "_" + std::to_string(it) + ".dat");
void save_space_vector(const std::vector<double> &vals,
const std::string &filename, size_t it) {
std::ofstream file("results/" + filename + "_" + std::to_string(it) + ".dat");
if (!file) throw std::runtime_error("failed to start file in results/");
if (!file)
throw std::runtime_error("failed to start file in results/");
file << vals.size() << "\n";
file << Parameters::X_DOMAIN_LEFT << " " << Parameters::X_DOMAIN_RIGHT << "\n";
file << std::fixed << std::setprecision(8);
for (double val : vals) file << val << "\n";
file << vals.size() << "\n";
file << Parameters::X_DOMAIN_LEFT << " " << Parameters::X_DOMAIN_RIGHT
<< "\n";
file << std::fixed << std::setprecision(8);
for (double val : vals)
file << val << "\n";
}