From 517c551bf5c46847971b1bcff1a9d8a230fe650c Mon Sep 17 00:00:00 2001 From: Anton Kamalov Date: Thu, 15 May 2025 00:35:37 +0300 Subject: [PATCH] USTAL --- MemMAPR_winda.vcxproj | 1 + src/Solver.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MemMAPR_winda.vcxproj b/MemMAPR_winda.vcxproj index 3f8476d..c1c60de 100644 --- a/MemMAPR_winda.vcxproj +++ b/MemMAPR_winda.vcxproj @@ -111,6 +111,7 @@ true _DEBUG;_CONSOLE;%(PreprocessorDefinitions) true + ./include Console diff --git a/src/Solver.cpp b/src/Solver.cpp index 2f3284a..93eded0 100644 --- a/src/Solver.cpp +++ b/src/Solver.cpp @@ -1,6 +1,6 @@ #include "Solver.hpp" -void Solver::SolveExplicit(System& program, double tstop) const { - std::ofstream output(filename_expl); +void Solver::SolveImplicit(System& program, double tstop) const { + std::ofstream output(filename_impl); //output << "t x y T" << std::endl; for (double t = 0.0; t < tstop; t += delta) { @@ -50,8 +50,8 @@ void Solver::SolveExplicit(System& program, double tstop) const { } } -void Solver::SolveImplicit(System& sys, double tstop) const { - std::ofstream output(filename_impl); +void Solver::SolveExplicit(System& sys, double tstop) const { + std::ofstream output(filename_expl); //output << "t x y T" << std::endl; for (double t = 0.; t < tstop; t += delta) { @@ -66,7 +66,7 @@ void Solver::SolveImplicit(System& sys, double tstop) const { double tx = (node->r()->T() - 2 * node->T() + node->l()->T()) / pow(sys.step(), 2); double ty = (node->u()->T() - 2 * node->T() + node->d()->T()) / pow(sys.step(), 2); - double t = delta * (tx + ty) + node->T(); + double t = delta * (tx + ty) * sys.a1()/pow(sys.step(), 2) + node->T(); node->SetT(t); } }