From 97489890e763ef333df19d007024211d510506ad Mon Sep 17 00:00:00 2001 From: Vincent Blain Date: Thu, 6 Oct 2022 14:28:29 +0000 Subject: [PATCH] [98] generated code update Generation of new generated code. Bug: https://github.com/cea-hpc/NabLab/issues/98 Signed-off-by: Vincent Blain --- .../ExplicitHeatEquationModule.cc | 26 +++++----- .../ExplicitHeatEquationModule.h | 2 +- .../accelerator/glace2d/Glace2d.axl | 4 +- .../accelerator/glace2d/Glace2dModule.cc | 50 +++++++++---------- .../accelerator/glace2d/Glace2dModule.h | 8 +-- .../heatequation/HeatEquationModule.cc | 18 +++---- .../heatequation/HeatEquationModule.h | 2 +- .../ImplicitHeatEquationModule.cc | 24 ++++----- .../ImplicitHeatEquationModule.h | 2 +- .../IterativeHeatEquationModule.cc | 26 +++++----- .../IterativeHeatEquationModule.h | 2 +- .../ExplicitHeatEquationModule.cc | 24 ++++----- .../ExplicitHeatEquationModule.h | 2 +- .../sequential/glace2d/Glace2d.axl | 4 +- .../sequential/glace2d/Glace2dModule.cc | 36 ++++++------- .../sequential/glace2d/Glace2dModule.h | 8 +-- .../heatequation/HeatEquationModule.cc | 14 +++--- .../heatequation/HeatEquationModule.h | 2 +- .../ImplicitHeatEquationModule.cc | 24 ++++----- .../ImplicitHeatEquationModule.h | 2 +- .../IterativeHeatEquationModule.cc | 24 ++++----- .../IterativeHeatEquationModule.h | 2 +- .../ExplicitHeatEquationModule.cc | 24 ++++----- .../ExplicitHeatEquationModule.h | 2 +- .../src-gen-arcane/thread/glace2d/Glace2d.axl | 4 +- .../thread/glace2d/Glace2dModule.cc | 36 ++++++------- .../thread/glace2d/Glace2dModule.h | 8 +-- .../thread/heatequation/HeatEquationModule.cc | 14 +++--- .../thread/heatequation/HeatEquationModule.h | 2 +- .../ImplicitHeatEquationModule.cc | 24 ++++----- .../ImplicitHeatEquationModule.h | 2 +- .../IterativeHeatEquationModule.cc | 24 ++++----- .../IterativeHeatEquationModule.h | 2 +- .../ExplicitHeatEquation.cc | 24 ++++----- .../ExplicitHeatEquation.h | 2 +- .../kokkos-team/glace2d/Glace2d.cc | 38 +++++++------- .../src-gen-cpp/kokkos-team/glace2d/Glace2d.h | 10 ++-- .../kokkos-team/heatequation/HeatEquation.cc | 14 +++--- .../kokkos-team/heatequation/HeatEquation.h | 2 +- .../ImplicitHeatEquation.cc | 24 ++++----- .../ImplicitHeatEquation.h | 2 +- .../IterativeHeatEquation.cc | 24 ++++----- .../IterativeHeatEquation.h | 2 +- .../ExplicitHeatEquation.cc | 24 ++++----- .../ExplicitHeatEquation.h | 2 +- .../src-gen-cpp/kokkos/glace2d/Glace2d.cc | 38 +++++++------- .../src-gen-cpp/kokkos/glace2d/Glace2d.h | 10 ++-- .../kokkos/heatequation/HeatEquation.cc | 14 +++--- .../kokkos/heatequation/HeatEquation.h | 2 +- .../ImplicitHeatEquation.cc | 24 ++++----- .../ImplicitHeatEquation.h | 2 +- .../IterativeHeatEquation.cc | 24 ++++----- .../IterativeHeatEquation.h | 2 +- .../ExplicitHeatEquation.cc | 24 ++++----- .../ExplicitHeatEquation.h | 2 +- .../src-gen-cpp/openmp/glace2d/Glace2d.cc | 38 +++++++------- .../src-gen-cpp/openmp/glace2d/Glace2d.h | 10 ++-- .../openmp/heatequation/HeatEquation.cc | 14 +++--- .../openmp/heatequation/HeatEquation.h | 2 +- .../ImplicitHeatEquation.cc | 24 ++++----- .../ImplicitHeatEquation.h | 2 +- .../IterativeHeatEquation.cc | 24 ++++----- .../IterativeHeatEquation.h | 2 +- .../ExplicitHeatEquation.cc | 24 ++++----- .../ExplicitHeatEquation.h | 2 +- .../src-gen-cpp/sequential/glace2d/Glace2d.cc | 38 +++++++------- .../src-gen-cpp/sequential/glace2d/Glace2d.h | 10 ++-- .../sequential/heatequation/HeatEquation.cc | 14 +++--- .../sequential/heatequation/HeatEquation.h | 2 +- .../ImplicitHeatEquation.cc | 24 ++++----- .../ImplicitHeatEquation.h | 2 +- .../IterativeHeatEquation.cc | 24 ++++----- .../IterativeHeatEquation.h | 2 +- .../ExplicitHeatEquation.cc | 24 ++++----- .../ExplicitHeatEquation.h | 2 +- .../src-gen-cpp/stl-thread/glace2d/Glace2d.cc | 38 +++++++------- .../src-gen-cpp/stl-thread/glace2d/Glace2d.h | 10 ++-- .../stl-thread/heatequation/HeatEquation.cc | 14 +++--- .../stl-thread/heatequation/HeatEquation.h | 2 +- .../ImplicitHeatEquation.cc | 24 ++++----- .../ImplicitHeatEquation.h | 2 +- .../IterativeHeatEquation.cc | 24 ++++----- .../IterativeHeatEquation.h | 2 +- .../ExplicitHeatEquation.java | 28 +++++------ .../src-gen-java/glace2d/Glace2d.java | 50 +++++++++---------- .../heatequation/HeatEquation.java | 18 +++---- .../ImplicitHeatEquation.java | 28 +++++------ .../IterativeHeatEquation.java | 28 +++++------ .../explicitheatequation.py | 26 +++++----- .../src-gen-python/glace2d/glace2d.py | 48 +++++++++--------- .../heatequation/heatequation.py | 18 +++---- .../implicitheatequation.py | 26 +++++----- .../iterativeheatequation.py | 26 +++++----- .../accelerator/hydroremap/Hydro.axl | 2 +- .../accelerator/hydroremap/HydroModule.cc | 2 +- .../accelerator/iteration/IterationModule.cc | 6 +-- .../accelerator/iteration/IterationModule.h | 2 +- .../accelerator/variables/VariablesModule.cc | 2 +- .../accelerator/variables/VariablesModule.h | 2 +- .../sequential/hydroremap/Hydro.axl | 2 +- .../sequential/hydroremap/HydroModule.cc | 2 +- .../sequential/iteration/IterationModule.cc | 6 +-- .../sequential/iteration/IterationModule.h | 2 +- .../sequential/variables/VariablesModule.cc | 2 +- .../sequential/variables/VariablesModule.h | 2 +- .../thread/hydroremap/Hydro.axl | 2 +- .../thread/hydroremap/HydroModule.cc | 2 +- .../thread/iteration/IterationModule.cc | 6 +-- .../thread/iteration/IterationModule.h | 2 +- .../thread/variables/VariablesModule.cc | 2 +- .../thread/variables/VariablesModule.h | 2 +- .../kokkos-team/hydroremap/Hydro.cc | 8 +-- .../kokkos-team/hydroremap/Hydro.h | 2 +- .../kokkos-team/iteration/Iteration.cc | 6 +-- .../kokkos-team/iteration/Iteration.h | 2 +- .../kokkos-team/variables/Variables.h | 2 +- .../src-gen-cpp/kokkos/hydroremap/Hydro.cc | 8 +-- .../src-gen-cpp/kokkos/hydroremap/Hydro.h | 2 +- .../src-gen-cpp/kokkos/iteration/Iteration.cc | 6 +-- .../src-gen-cpp/kokkos/iteration/Iteration.h | 2 +- .../src-gen-cpp/kokkos/variables/Variables.h | 2 +- .../src-gen-cpp/openmp/hydroremap/Hydro.cc | 8 +-- .../src-gen-cpp/openmp/hydroremap/Hydro.h | 2 +- .../src-gen-cpp/openmp/iteration/Iteration.cc | 6 +-- .../src-gen-cpp/openmp/iteration/Iteration.h | 2 +- .../src-gen-cpp/openmp/variables/Variables.h | 2 +- .../sequential/hydroremap/Hydro.cc | 8 +-- .../src-gen-cpp/sequential/hydroremap/Hydro.h | 2 +- .../sequential/iteration/Iteration.cc | 6 +-- .../sequential/iteration/Iteration.h | 2 +- .../sequential/variables/Variables.h | 2 +- .../stl-thread/hydroremap/Hydro.cc | 8 +-- .../src-gen-cpp/stl-thread/hydroremap/Hydro.h | 2 +- .../stl-thread/iteration/Iteration.cc | 6 +-- .../stl-thread/iteration/Iteration.h | 2 +- .../stl-thread/variables/Variables.h | 2 +- .../src-gen-java/hydroremap/Hydro.java | 10 ++-- .../src-gen-java/iteration/Iteration.java | 10 ++-- .../src-gen-java/variables/Variables.java | 2 +- .../src-gen-python/hydroremap/hydro.py | 2 +- .../src-gen-python/iteration/iteration.py | 10 ++-- .../src-gen/hydroremap/HydroRemapDefault.json | 2 +- 142 files changed, 819 insertions(+), 819 deletions(-) diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.cc index 769002ac2..86af156a5 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.cc @@ -96,7 +96,7 @@ void ExplicitHeatEquationModule::init() // initialization of other attributes m_lastDump = numeric_limits::min(); m_n = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_alpha.resize(nbCell()); // calling jobs @@ -144,12 +144,12 @@ void ExplicitHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -267,7 +267,7 @@ void ExplicitHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquationModule::computeDeltaTn() { @@ -283,8 +283,8 @@ void ExplicitHeatEquationModule::computeDeltaTn() }; reduction0 = reducer.reduce(); } - m_deltat = reduction0 * 0.24; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.24; + m_global_deltat = m_delta_t; } /** @@ -359,13 +359,13 @@ void ExplicitHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquationModule::computeAlphaCoeff() { auto command = makeCommand(m_default_queue); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_V = ax::viewIn(command, m_V); auto in_faceLength = ax::viewIn(command, m_faceLength); auto in_faceConductivity = ax::viewIn(command, m_faceConductivity); @@ -374,7 +374,7 @@ void ExplicitHeatEquationModule::computeAlphaCoeff() command << RUNCOMMAND_ENUMERATE(Cell, cCells, allCells()) { const auto cId(cCells); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -384,12 +384,12 @@ void ExplicitHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(in_deltat / in_V[cCells] * (in_faceLength[fFaces] * in_faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(in_Xc[cCells], in_Xc[dCells]))); - out_alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(in_delta_t / in_V[cCells] * (in_faceLength[fFaces] * in_faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(in_Xc[cCells], in_Xc[dCells]))); + out_alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - out_alpha[cCells][cCells] = 1 - alphaDiag; + out_alpha[cCells][cCells] = 1 - alpha_Diag; }; } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.h index ba074621d..634796ada 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/explicitheatequation/ExplicitHeatEquationModule.h @@ -71,7 +71,7 @@ class ExplicitHeatEquationModule Int32 m_n; static constexpr Real m_u0 = 1.0; static constexpr Real2 m_vectOne = {1.0, 1.0}; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2d.axl b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2d.axl index c64a521db..f91f35357 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2d.axl +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2d.axl @@ -149,8 +149,8 @@ need-sync="true"/> ::max()); { auto command = makeCommand(m_default_queue); - auto in_deltatj = ax::viewIn(command, m_deltatj); + auto in_delta_tj = ax::viewIn(command, m_delta_tj); ax::ReducerMin reducer(command); command << RUNCOMMAND_ENUMERATE(Cell, jCells, allCells()) { - reducer.min(in_deltatj[jCells]); + reducer.min(in_delta_tj[jCells]); }; reduction0 = reducer.reduce(); } - m_deltat = std::min((m_deltatCfl * reduction0), (options()->stopTime() - m_t_n)); - m_global_deltat = m_deltat; + m_delta_t = std::min((m_delta_tCfl * reduction0), (options()->stopTime() - m_t_n)); + m_global_deltat = m_delta_t; } /** @@ -855,12 +855,12 @@ void Glace2dModule::computeMt() /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Glace2dModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -912,25 +912,25 @@ void Glace2dModule::computeFjr() /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ void Glace2dModule::computeXn() { auto command = makeCommand(m_default_queue); auto in_X_n = ax::viewIn(command, m_X_n); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_ur = ax::viewIn(command, m_ur); auto out_X_nplus1 = ax::viewOut(command, m_X_nplus1); command << RUNCOMMAND_ENUMERATE(Node, rNodes, allNodes()) { - out_X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(in_X_n[rNodes], glace2dfreefuncs::operatorMult(in_deltat, in_ur[rNodes])); + out_X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(in_X_n[rNodes], glace2dfreefuncs::operatorMult(in_delta_t, in_ur[rNodes])); }; } /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ void Glace2dModule::computeEn() @@ -939,7 +939,7 @@ void Glace2dModule::computeEn() auto in_F = ax::viewIn(command, m_F); auto in_ur = ax::viewIn(command, m_ur); auto in_E_n = ax::viewIn(command, m_E_n); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_m = ax::viewIn(command, m_m); auto out_E_nplus1 = ax::viewOut(command, m_E_nplus1); command << RUNCOMMAND_ENUMERATE(Cell, jCells, allCells()) @@ -956,13 +956,13 @@ void Glace2dModule::computeEn() reduction0 = glace2dfreefuncs::sumR0(reduction0, glace2dfreefuncs::dot(in_F[jCells][rNodesOfCellJ], in_ur[rNodes])); } } - out_E_nplus1[jCells] = in_E_n[jCells] - (in_deltat / in_m[jCells]) * reduction0; + out_E_nplus1[jCells] = in_E_n[jCells] - (in_delta_t / in_m[jCells]) * reduction0; }; } /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ void Glace2dModule::computeUn() @@ -970,7 +970,7 @@ void Glace2dModule::computeUn() auto command = makeCommand(m_default_queue); auto in_F = ax::viewIn(command, m_F); auto in_uj_n = ax::viewIn(command, m_uj_n); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_m = ax::viewIn(command, m_m); auto out_uj_nplus1 = ax::viewOut(command, m_uj_nplus1); command << RUNCOMMAND_ENUMERATE(Cell, jCells, allCells()) @@ -985,7 +985,7 @@ void Glace2dModule::computeUn() reduction0 = glace2dfreefuncs::sumR1(reduction0, in_F[jCells][rNodesOfCellJ]); } } - out_uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(in_uj_n[jCells], glace2dfreefuncs::operatorMult((in_deltat / in_m[jCells]), reduction0)); + out_uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(in_uj_n[jCells], glace2dfreefuncs::operatorMult((in_delta_t / in_m[jCells]), reduction0)); }; } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2dModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2dModule.h index 16428d8f6..ad72a4f43 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2dModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/glace2d/Glace2dModule.h @@ -94,15 +94,15 @@ class Glace2dModule Int32 m_n; static constexpr Real m_gamma = 1.4; static constexpr Real m_xInterface = 0.5; - static constexpr Real m_deltatCfl = 0.4; - static constexpr Real m_rhoIniZg = 1.0; - static constexpr Real m_rhoIniZd = 0.125; + static constexpr Real m_delta_tCfl = 0.4; + static constexpr Real m_rho_IniZg = 1.0; + static constexpr Real m_rho_IniZd = 0.125; static constexpr Real m_pIniZg = 1.0; static constexpr Real m_pIniZd = 0.1; Real m_t_n; Real m_t_nplus1; Real m_t_n0; - Real m_deltat; + Real m_delta_t; // accelerator queue ax::RunQueue* m_default_queue = nullptr; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.cc index fc94f846e..b94b0d641 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.cc @@ -88,7 +88,7 @@ void HeatEquationModule::init() m_n = 0; // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs computeSurface(); // @1.0 @@ -102,7 +102,7 @@ void HeatEquationModule::init() /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquationModule::computeOutgoingFlux() @@ -111,7 +111,7 @@ void HeatEquationModule::computeOutgoingFlux() auto in_u_n = ax::viewIn(command, m_u_n); auto in_center = ax::viewIn(command, m_center); auto in_surface = ax::viewIn(command, m_surface); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_V = ax::viewIn(command, m_V); auto out_outgoingFlux = ax::viewOut(command, m_outgoingFlux); command << RUNCOMMAND_ENUMERATE(Cell, j1Cells, allCells()) @@ -131,7 +131,7 @@ void HeatEquationModule::computeOutgoingFlux() reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - out_outgoingFlux[j1Cells] = in_deltat / in_V[j1Cells] * reduction0; + out_outgoingFlux[j1Cells] = in_delta_t / in_V[j1Cells] * reduction0; }; } @@ -167,12 +167,12 @@ void HeatEquationModule::computeSurface() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -260,20 +260,20 @@ void HeatEquationModule::iniTime() /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquationModule::computeUn() { auto command = makeCommand(m_default_queue); auto in_f = ax::viewIn(command, m_f); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_u_n = ax::viewIn(command, m_u_n); auto in_outgoingFlux = ax::viewIn(command, m_outgoingFlux); auto out_u_nplus1 = ax::viewOut(command, m_u_nplus1); command << RUNCOMMAND_ENUMERATE(Cell, jCells, allCells()) { - out_u_nplus1[jCells] = in_f[jCells] * in_deltat + in_u_n[jCells] + in_outgoingFlux[jCells]; + out_u_nplus1[jCells] = in_f[jCells] * in_delta_t + in_u_n[jCells] + in_outgoingFlux[jCells]; }; } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.h index 410a666c4..deb39cf28 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/heatequation/HeatEquationModule.h @@ -67,7 +67,7 @@ class HeatEquationModule Int32 m_n; static constexpr Real m_PI = 3.1415926; static constexpr Real m_alpha = 1.0; - static constexpr Real m_deltat = 0.001; + static constexpr Real m_delta_t = 0.001; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.cc index 225e57d37..27ca771b3 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.cc @@ -99,7 +99,7 @@ void ImplicitHeatEquationModule::init() // initialization of other attributes m_lastDump = numeric_limits::min(); m_n = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_u_n.resize(nbCell()); m_u_nplus1.resize(nbCell()); m_alpha.resize(nbCell(), nbCell()); @@ -151,12 +151,12 @@ void ImplicitHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ImplicitHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -255,7 +255,7 @@ void ImplicitHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ImplicitHeatEquationModule::computeDeltaTn() { @@ -271,8 +271,8 @@ void ImplicitHeatEquationModule::computeDeltaTn() }; reduction0 = reducer.reduce(); } - m_deltat = reduction0 * 0.24; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.24; + m_global_deltat = m_delta_t; } /** @@ -345,7 +345,7 @@ void ImplicitHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ImplicitHeatEquationModule::computeAlphaCoeff() @@ -355,7 +355,7 @@ void ImplicitHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, view) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -365,12 +365,12 @@ void ImplicitHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(-m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha.setValue(cCells.localId(), dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(-m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha.setValue(cCells.localId(), dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha.setValue(cCells.localId(), cCells.localId(), 1 - alphaDiag); + m_alpha.setValue(cCells.localId(), cCells.localId(), 1 - alpha_Diag); } }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.h index 4e25447cb..d65ed65f2 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/implicitheatequation/ImplicitHeatEquationModule.h @@ -74,7 +74,7 @@ class ImplicitHeatEquationModule Int32 m_n; static constexpr Real m_u0 = 1.0; static constexpr Real2 m_vectOne = {1.0, 1.0}; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.cc index 8c921b96c..3f0f8696c 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.cc @@ -110,7 +110,7 @@ void IterativeHeatEquationModule::init() m_lastDump = numeric_limits::min(); m_n = 0; m_k = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_alpha.resize(nbCell()); // calling jobs @@ -158,12 +158,12 @@ void IterativeHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -298,7 +298,7 @@ void IterativeHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquationModule::computeDeltaTn() { @@ -314,8 +314,8 @@ void IterativeHeatEquationModule::computeDeltaTn() }; reduction0 = reducer.reduce(); } - m_deltat = reduction0 * 0.1; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.1; + m_global_deltat = m_delta_t; } /** @@ -441,13 +441,13 @@ void IterativeHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquationModule::computeAlphaCoeff() { auto command = makeCommand(m_default_queue); - auto in_deltat = m_deltat; + auto in_delta_t = m_delta_t; auto in_V = ax::viewIn(command, m_V); auto in_faceLength = ax::viewIn(command, m_faceLength); auto in_faceConductivity = ax::viewIn(command, m_faceConductivity); @@ -456,7 +456,7 @@ void IterativeHeatEquationModule::computeAlphaCoeff() command << RUNCOMMAND_ENUMERATE(Cell, cCells, allCells()) { const auto cId(cCells); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -466,12 +466,12 @@ void IterativeHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(in_deltat / in_V[cCells] * (in_faceLength[fFaces] * in_faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(in_Xc[cCells], in_Xc[dCells]))); - out_alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(in_delta_t / in_V[cCells] * (in_faceLength[fFaces] * in_faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(in_Xc[cCells], in_Xc[dCells]))); + out_alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - out_alpha[cCells][cCells] = -alphaDiag; + out_alpha[cCells][cCells] = -alpha_Diag; }; } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.h index 8c67102f2..d11e49ea6 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/accelerator/iterativeheatequation/IterativeHeatEquationModule.h @@ -80,7 +80,7 @@ class IterativeHeatEquationModule static constexpr Real2 m_vectOne = {1.0, 1.0}; static constexpr Int32 m_maxIterationsK = 1000; static constexpr Real m_epsilon = 1.0E-8; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.cc index 373e38c6f..487b0f712 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.cc @@ -95,7 +95,7 @@ void ExplicitHeatEquationModule::init() // initialization of other attributes m_lastDump = numeric_limits::min(); m_n = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_alpha.resize(nbCell()); // calling jobs @@ -140,12 +140,12 @@ void ExplicitHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -251,7 +251,7 @@ void ExplicitHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquationModule::computeDeltaTn() { @@ -260,8 +260,8 @@ void ExplicitHeatEquationModule::computeDeltaTn() { reduction0 = explicitheatequationfreefuncs::minR0(reduction0, m_V[cCells] / m_D[cCells]); } - m_deltat = reduction0 * 0.24; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.24; + m_global_deltat = m_delta_t; } /** @@ -328,7 +328,7 @@ void ExplicitHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquationModule::computeAlphaCoeff() @@ -336,7 +336,7 @@ void ExplicitHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, allCells()) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -346,12 +346,12 @@ void ExplicitHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha[cCells][cCells.localId()] = 1 - alphaDiag; + m_alpha[cCells][cCells.localId()] = 1 - alpha_Diag; } } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.h index a24b80336..e1de75b64 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/explicitheatequation/ExplicitHeatEquationModule.h @@ -66,7 +66,7 @@ class ExplicitHeatEquationModule Int32 m_n; static constexpr Real m_u0 = 1.0; static constexpr Real2 m_vectOne = {1.0, 1.0}; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2d.axl b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2d.axl index c64a521db..f91f35357 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2d.axl +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2d.axl @@ -149,8 +149,8 @@ need-sync="true"/> ::max()); ENUMERATE_CELL(jCells, allCells()) { - reduction0 = glace2dfreefuncs::minR0(reduction0, m_deltatj[jCells]); + reduction0 = glace2dfreefuncs::minR0(reduction0, m_delta_tj[jCells]); } - m_deltat = std::min((m_deltatCfl * reduction0), (options()->stopTime() - m_t_n)); - m_global_deltat = m_deltat; + m_delta_t = std::min((m_delta_tCfl * reduction0), (options()->stopTime() - m_t_n)); + m_global_deltat = m_delta_t; } /** @@ -733,12 +733,12 @@ void Glace2dModule::computeMt() /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Glace2dModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -779,20 +779,20 @@ void Glace2dModule::computeFjr() /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ void Glace2dModule::computeXn() { ENUMERATE_NODE(rNodes, allNodes()) { - m_X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(m_X_n[rNodes], glace2dfreefuncs::operatorMult(m_deltat, m_ur[rNodes])); + m_X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(m_X_n[rNodes], glace2dfreefuncs::operatorMult(m_delta_t, m_ur[rNodes])); } } /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ void Glace2dModule::computeEn() @@ -811,13 +811,13 @@ void Glace2dModule::computeEn() reduction0 = glace2dfreefuncs::sumR0(reduction0, glace2dfreefuncs::dot(m_F[jCells][rNodesOfCellJ], m_ur[rNodes])); } } - m_E_nplus1[jCells] = m_E_n[jCells] - (m_deltat / m_m[jCells]) * reduction0; + m_E_nplus1[jCells] = m_E_n[jCells] - (m_delta_t / m_m[jCells]) * reduction0; } } /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ void Glace2dModule::computeUn() @@ -834,7 +834,7 @@ void Glace2dModule::computeUn() reduction0 = glace2dfreefuncs::sumR1(reduction0, m_F[jCells][rNodesOfCellJ]); } } - m_uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(m_uj_n[jCells], glace2dfreefuncs::operatorMult((m_deltat / m_m[jCells]), reduction0)); + m_uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(m_uj_n[jCells], glace2dfreefuncs::operatorMult((m_delta_t / m_m[jCells]), reduction0)); } } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2dModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2dModule.h index 62b72e2c4..131666ddc 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2dModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/glace2d/Glace2dModule.h @@ -89,15 +89,15 @@ class Glace2dModule Int32 m_n; static constexpr Real m_gamma = 1.4; static constexpr Real m_xInterface = 0.5; - static constexpr Real m_deltatCfl = 0.4; - static constexpr Real m_rhoIniZg = 1.0; - static constexpr Real m_rhoIniZd = 0.125; + static constexpr Real m_delta_tCfl = 0.4; + static constexpr Real m_rho_IniZg = 1.0; + static constexpr Real m_rho_IniZd = 0.125; static constexpr Real m_pIniZg = 1.0; static constexpr Real m_pIniZd = 0.1; Real m_t_n; Real m_t_nplus1; Real m_t_n0; - Real m_deltat; + Real m_delta_t; }; #endif diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.cc index 1458df4b1..6d1cf79df 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.cc @@ -87,7 +87,7 @@ void HeatEquationModule::init() m_n = 0; // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs computeSurface(); // @1.0 @@ -101,7 +101,7 @@ void HeatEquationModule::init() /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquationModule::computeOutgoingFlux() @@ -123,7 +123,7 @@ void HeatEquationModule::computeOutgoingFlux() reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - m_outgoingFlux[j1Cells] = m_deltat / m_V[j1Cells] * reduction0; + m_outgoingFlux[j1Cells] = m_delta_t / m_V[j1Cells] * reduction0; } } @@ -156,12 +156,12 @@ void HeatEquationModule::computeSurface() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -241,14 +241,14 @@ void HeatEquationModule::iniTime() /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquationModule::computeUn() { ENUMERATE_CELL(jCells, allCells()) { - m_u_nplus1[jCells] = m_f[jCells] * m_deltat + m_u_n[jCells] + m_outgoingFlux[jCells]; + m_u_nplus1[jCells] = m_f[jCells] * m_delta_t + m_u_n[jCells] + m_outgoingFlux[jCells]; } } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.h index 3fc425314..0f6c259af 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/heatequation/HeatEquationModule.h @@ -62,7 +62,7 @@ class HeatEquationModule Int32 m_n; static constexpr Real m_PI = 3.1415926; static constexpr Real m_alpha = 1.0; - static constexpr Real m_deltat = 0.001; + static constexpr Real m_delta_t = 0.001; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.cc index 11fadf7c7..3ef5047ac 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.cc @@ -98,7 +98,7 @@ void ImplicitHeatEquationModule::init() // initialization of other attributes m_lastDump = numeric_limits::min(); m_n = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_u_n.resize(nbCell()); m_u_nplus1.resize(nbCell()); m_alpha.resize(nbCell(), nbCell()); @@ -147,12 +147,12 @@ void ImplicitHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ImplicitHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -243,7 +243,7 @@ void ImplicitHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ImplicitHeatEquationModule::computeDeltaTn() { @@ -252,8 +252,8 @@ void ImplicitHeatEquationModule::computeDeltaTn() { reduction0 = implicitheatequationfreefuncs::minR0(reduction0, m_V[cCells] / m_D[cCells]); } - m_deltat = reduction0 * 0.24; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.24; + m_global_deltat = m_delta_t; } /** @@ -320,7 +320,7 @@ void ImplicitHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ImplicitHeatEquationModule::computeAlphaCoeff() @@ -328,7 +328,7 @@ void ImplicitHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, allCells()) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -338,12 +338,12 @@ void ImplicitHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(-m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha.setValue(cCells.localId(), dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(-m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha.setValue(cCells.localId(), dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha.setValue(cCells.localId(), cCells.localId(), 1 - alphaDiag); + m_alpha.setValue(cCells.localId(), cCells.localId(), 1 - alpha_Diag); } } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.h index 97a382710..87710f137 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/implicitheatequation/ImplicitHeatEquationModule.h @@ -69,7 +69,7 @@ class ImplicitHeatEquationModule Int32 m_n; static constexpr Real m_u0 = 1.0; static constexpr Real2 m_vectOne = {1.0, 1.0}; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.cc index f45ace82d..c17b2f2df 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.cc @@ -109,7 +109,7 @@ void IterativeHeatEquationModule::init() m_lastDump = numeric_limits::min(); m_n = 0; m_k = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_alpha.resize(nbCell()); // calling jobs @@ -154,12 +154,12 @@ void IterativeHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -278,7 +278,7 @@ void IterativeHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquationModule::computeDeltaTn() { @@ -287,8 +287,8 @@ void IterativeHeatEquationModule::computeDeltaTn() { reduction0 = iterativeheatequationfreefuncs::minR0(reduction0, m_V[cCells] / m_D[cCells]); } - m_deltat = reduction0 * 0.1; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.1; + m_global_deltat = m_delta_t; } /** @@ -396,7 +396,7 @@ void IterativeHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquationModule::computeAlphaCoeff() @@ -404,7 +404,7 @@ void IterativeHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, allCells()) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -414,12 +414,12 @@ void IterativeHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha[cCells][cCells.localId()] = -alphaDiag; + m_alpha[cCells][cCells.localId()] = -alpha_Diag; } } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.h index e43f4722d..797795b1a 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/sequential/iterativeheatequation/IterativeHeatEquationModule.h @@ -75,7 +75,7 @@ class IterativeHeatEquationModule static constexpr Real2 m_vectOne = {1.0, 1.0}; static constexpr Int32 m_maxIterationsK = 1000; static constexpr Real m_epsilon = 1.0E-8; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.cc index e6da3e5e8..1cda0ced2 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.cc @@ -95,7 +95,7 @@ void ExplicitHeatEquationModule::init() // initialization of other attributes m_lastDump = numeric_limits::min(); m_n = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_alpha.resize(nbCell()); // calling jobs @@ -143,12 +143,12 @@ void ExplicitHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -266,7 +266,7 @@ void ExplicitHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquationModule::computeDeltaTn() { @@ -275,8 +275,8 @@ void ExplicitHeatEquationModule::computeDeltaTn() { reduction0 = explicitheatequationfreefuncs::minR0(reduction0, m_V[cCells] / m_D[cCells]); } - m_deltat = reduction0 * 0.24; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.24; + m_global_deltat = m_delta_t; } /** @@ -349,7 +349,7 @@ void ExplicitHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquationModule::computeAlphaCoeff() @@ -359,7 +359,7 @@ void ExplicitHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, view) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -369,12 +369,12 @@ void ExplicitHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha[cCells][cCells.localId()] = 1 - alphaDiag; + m_alpha[cCells][cCells.localId()] = 1 - alpha_Diag; } }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.h index a24b80336..e1de75b64 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/explicitheatequation/ExplicitHeatEquationModule.h @@ -66,7 +66,7 @@ class ExplicitHeatEquationModule Int32 m_n; static constexpr Real m_u0 = 1.0; static constexpr Real2 m_vectOne = {1.0, 1.0}; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2d.axl b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2d.axl index c64a521db..f91f35357 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2d.axl +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2d.axl @@ -149,8 +149,8 @@ need-sync="true"/> ::max()); ENUMERATE_CELL(jCells, allCells()) { - reduction0 = glace2dfreefuncs::minR0(reduction0, m_deltatj[jCells]); + reduction0 = glace2dfreefuncs::minR0(reduction0, m_delta_tj[jCells]); } - m_deltat = std::min((m_deltatCfl * reduction0), (options()->stopTime() - m_t_n)); - m_global_deltat = m_deltat; + m_delta_t = std::min((m_delta_tCfl * reduction0), (options()->stopTime() - m_t_n)); + m_global_deltat = m_delta_t; } /** @@ -802,12 +802,12 @@ void Glace2dModule::computeMt() /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Glace2dModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -854,7 +854,7 @@ void Glace2dModule::computeFjr() /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ void Glace2dModule::computeXn() @@ -863,14 +863,14 @@ void Glace2dModule::computeXn() { ENUMERATE_NODE(rNodes, view) { - m_X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(m_X_n[rNodes], glace2dfreefuncs::operatorMult(m_deltat, m_ur[rNodes])); + m_X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(m_X_n[rNodes], glace2dfreefuncs::operatorMult(m_delta_t, m_ur[rNodes])); } }); } /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ void Glace2dModule::computeEn() @@ -891,14 +891,14 @@ void Glace2dModule::computeEn() reduction0 = glace2dfreefuncs::sumR0(reduction0, glace2dfreefuncs::dot(m_F[jCells][rNodesOfCellJ], m_ur[rNodes])); } } - m_E_nplus1[jCells] = m_E_n[jCells] - (m_deltat / m_m[jCells]) * reduction0; + m_E_nplus1[jCells] = m_E_n[jCells] - (m_delta_t / m_m[jCells]) * reduction0; } }); } /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ void Glace2dModule::computeUn() @@ -917,7 +917,7 @@ void Glace2dModule::computeUn() reduction0 = glace2dfreefuncs::sumR1(reduction0, m_F[jCells][rNodesOfCellJ]); } } - m_uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(m_uj_n[jCells], glace2dfreefuncs::operatorMult((m_deltat / m_m[jCells]), reduction0)); + m_uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(m_uj_n[jCells], glace2dfreefuncs::operatorMult((m_delta_t / m_m[jCells]), reduction0)); } }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2dModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2dModule.h index 62b72e2c4..131666ddc 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2dModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/glace2d/Glace2dModule.h @@ -89,15 +89,15 @@ class Glace2dModule Int32 m_n; static constexpr Real m_gamma = 1.4; static constexpr Real m_xInterface = 0.5; - static constexpr Real m_deltatCfl = 0.4; - static constexpr Real m_rhoIniZg = 1.0; - static constexpr Real m_rhoIniZd = 0.125; + static constexpr Real m_delta_tCfl = 0.4; + static constexpr Real m_rho_IniZg = 1.0; + static constexpr Real m_rho_IniZd = 0.125; static constexpr Real m_pIniZg = 1.0; static constexpr Real m_pIniZd = 0.1; Real m_t_n; Real m_t_nplus1; Real m_t_n0; - Real m_deltat; + Real m_delta_t; }; #endif diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.cc index 035fad99d..0049a72d8 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.cc @@ -87,7 +87,7 @@ void HeatEquationModule::init() m_n = 0; // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs computeSurface(); // @1.0 @@ -101,7 +101,7 @@ void HeatEquationModule::init() /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquationModule::computeOutgoingFlux() @@ -125,7 +125,7 @@ void HeatEquationModule::computeOutgoingFlux() reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - m_outgoingFlux[j1Cells] = m_deltat / m_V[j1Cells] * reduction0; + m_outgoingFlux[j1Cells] = m_delta_t / m_V[j1Cells] * reduction0; } }); } @@ -162,12 +162,12 @@ void HeatEquationModule::computeSurface() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -256,7 +256,7 @@ void HeatEquationModule::iniTime() /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquationModule::computeUn() @@ -265,7 +265,7 @@ void HeatEquationModule::computeUn() { ENUMERATE_CELL(jCells, view) { - m_u_nplus1[jCells] = m_f[jCells] * m_deltat + m_u_n[jCells] + m_outgoingFlux[jCells]; + m_u_nplus1[jCells] = m_f[jCells] * m_delta_t + m_u_n[jCells] + m_outgoingFlux[jCells]; } }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.h index 3fc425314..0f6c259af 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/heatequation/HeatEquationModule.h @@ -62,7 +62,7 @@ class HeatEquationModule Int32 m_n; static constexpr Real m_PI = 3.1415926; static constexpr Real m_alpha = 1.0; - static constexpr Real m_deltat = 0.001; + static constexpr Real m_delta_t = 0.001; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.cc index dc664e398..42e0b655d 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.cc @@ -98,7 +98,7 @@ void ImplicitHeatEquationModule::init() // initialization of other attributes m_lastDump = numeric_limits::min(); m_n = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_u_n.resize(nbCell()); m_u_nplus1.resize(nbCell()); m_alpha.resize(nbCell(), nbCell()); @@ -150,12 +150,12 @@ void ImplicitHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ImplicitHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -255,7 +255,7 @@ void ImplicitHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ImplicitHeatEquationModule::computeDeltaTn() { @@ -264,8 +264,8 @@ void ImplicitHeatEquationModule::computeDeltaTn() { reduction0 = implicitheatequationfreefuncs::minR0(reduction0, m_V[cCells] / m_D[cCells]); } - m_deltat = reduction0 * 0.24; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.24; + m_global_deltat = m_delta_t; } /** @@ -338,7 +338,7 @@ void ImplicitHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ImplicitHeatEquationModule::computeAlphaCoeff() @@ -348,7 +348,7 @@ void ImplicitHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, view) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -358,12 +358,12 @@ void ImplicitHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(-m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha.setValue(cCells.localId(), dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(-m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha.setValue(cCells.localId(), dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha.setValue(cCells.localId(), cCells.localId(), 1 - alphaDiag); + m_alpha.setValue(cCells.localId(), cCells.localId(), 1 - alpha_Diag); } }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.h index 97a382710..87710f137 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/implicitheatequation/ImplicitHeatEquationModule.h @@ -69,7 +69,7 @@ class ImplicitHeatEquationModule Int32 m_n; static constexpr Real m_u0 = 1.0; static constexpr Real2 m_vectOne = {1.0, 1.0}; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.cc index 60163deed..155f87f48 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.cc @@ -109,7 +109,7 @@ void IterativeHeatEquationModule::init() m_lastDump = numeric_limits::min(); m_n = 0; m_k = 0; - m_deltat = 0.001; + m_delta_t = 0.001; m_alpha.resize(nbCell()); // calling jobs @@ -157,12 +157,12 @@ void IterativeHeatEquationModule::computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** @@ -296,7 +296,7 @@ void IterativeHeatEquationModule::updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquationModule::computeDeltaTn() { @@ -305,8 +305,8 @@ void IterativeHeatEquationModule::computeDeltaTn() { reduction0 = iterativeheatequationfreefuncs::minR0(reduction0, m_V[cCells] / m_D[cCells]); } - m_deltat = reduction0 * 0.1; - m_global_deltat = m_deltat; + m_delta_t = reduction0 * 0.1; + m_global_deltat = m_delta_t; } /** @@ -423,7 +423,7 @@ void IterativeHeatEquationModule::setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquationModule::computeAlphaCoeff() @@ -433,7 +433,7 @@ void IterativeHeatEquationModule::computeAlphaCoeff() ENUMERATE_CELL(cCells, view) { const auto cId(cCells.asItemLocalId()); - Real alphaDiag(0.0); + Real alpha_Diag(0.0); { const auto neighbourCellsC(m_mesh->getNeighbourCells(cId)); const Int32 nbNeighbourCellsC(neighbourCellsC.size()); @@ -443,12 +443,12 @@ void IterativeHeatEquationModule::computeAlphaCoeff() const auto dCells(dId); const auto fId(m_mesh->getCommonFace(cId, dId)); const auto fFaces(fId); - const Real alphaExtraDiag(m_deltat / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); - m_alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const Real alpha_ExtraDiag(m_delta_t / m_V[cCells] * (m_faceLength[fFaces] * m_faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(m_Xc[cCells], m_Xc[dCells]))); + m_alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - m_alpha[cCells][cCells.localId()] = -alphaDiag; + m_alpha[cCells][cCells.localId()] = -alpha_Diag; } }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.h index e43f4722d..797795b1a 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-arcane/thread/iterativeheatequation/IterativeHeatEquationModule.h @@ -75,7 +75,7 @@ class IterativeHeatEquationModule static constexpr Real2 m_vectOne = {1.0, 1.0}; static constexpr Int32 m_maxIterationsK = 1000; static constexpr Real m_epsilon = 1.0E-8; - Real m_deltat; + Real m_delta_t; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.cc index 508ce3070..9829a19e5 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.cc @@ -138,7 +138,7 @@ ExplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -208,12 +208,12 @@ void ExplicitHeatEquation::computeFaceLength(const member_type& teamMember) noex /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -347,7 +347,7 @@ void ExplicitHeatEquation::updateU(const member_type& teamMember) noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquation::computeDeltaTn(const member_type& teamMember) noexcept { @@ -356,7 +356,7 @@ void ExplicitHeatEquation::computeDeltaTn(const member_type& teamMember) noexcep { accu = explicitheatequationfreefuncs::minR0(accu, V(cCells) / D(cCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &explicitheatequationfreefuncs::minR0)); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -441,7 +441,7 @@ void ExplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquation::computeAlphaCoeff(const member_type& teamMember) noexcept @@ -455,7 +455,7 @@ void ExplicitHeatEquation::computeAlphaCoeff(const member_type& teamMember) noex { int cCells(cCellsTeam + teamWork.first); const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -465,12 +465,12 @@ void ExplicitHeatEquation::computeAlphaCoeff(const member_type& teamMember) noex const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(deltat / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); - alpha(cCells, dCells) = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(delta_t / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); + alpha(cCells, dCells) = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha(cCells, cCells) = 1 - alphaDiag; + alpha(cCells, cCells) = 1 - alpha_Diag; }); } } @@ -529,7 +529,7 @@ void ExplicitHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.h index 4119ac0f8..a53c67dcc 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/explicitheatequation/ExplicitHeatEquation.h @@ -108,7 +108,7 @@ class ExplicitHeatEquation int maxIterations; static constexpr double u0 = 1.0; static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.cc index 191449116..ba2bd073f 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.cc @@ -238,7 +238,7 @@ Glace2d::Glace2d(CartesianMesh2D& aMesh) , E_n("E_n", nbCells) , E_nplus1("E_nplus1", nbCells) , V("V", nbCells) -, deltatj("deltatj", nbCells) +, delta_tj("delta_tj", nbCells) , uj_n("uj_n", nbCells) , uj_nplus1("uj_nplus1", nbCells) , l("l", nbCells, 4) @@ -469,7 +469,7 @@ void Glace2d::computeV(const member_type& teamMember) noexcept /** * Job initialize called @2.0 in simulate method. - * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface * Out variables: E_n, m, p, rho, uj_n */ void Glace2d::initialize(const member_type& teamMember) noexcept @@ -499,12 +499,12 @@ void Glace2d::initialize(const member_type& teamMember) noexcept const RealArray1D<2> center(glace2dfreefuncs::operatorMult(0.25, reduction0)); if (center[0] < xInterface) { - rho_ic = rhoIniZg; + rho_ic = rho_IniZg; p_ic = pIniZg; } else { - rho_ic = rhoIniZd; + rho_ic = rho_IniZd; p_ic = pIniZd; } double reduction1(0.0); @@ -710,7 +710,7 @@ void Glace2d::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); @@ -792,7 +792,7 @@ void Glace2d::computeAjr(const member_type& teamMember) noexcept /** * Job computedeltatj called @6.0 in executeTimeLoopN method. * In variables: V, c, l - * Out variables: deltatj + * Out variables: delta_tj */ void Glace2d::computedeltatj(const member_type& teamMember) noexcept { @@ -814,7 +814,7 @@ void Glace2d::computedeltatj(const member_type& teamMember) noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, l(jCells, rNodesOfCellJ)); } } - deltatj(jCells) = 2.0 * V(jCells) / (c(jCells) * reduction0); + delta_tj(jCells) = 2.0 * V(jCells) / (c(jCells) * reduction0); }); } } @@ -896,17 +896,17 @@ void Glace2d::computeBr(const member_type& teamMember) noexcept /** * Job computeDt called @7.0 in executeTimeLoopN method. - * In variables: deltatCfl, deltatj, stopTime, t_n - * Out variables: deltat + * In variables: delta_tCfl, delta_tj, stopTime, t_n + * Out variables: delta_t */ void Glace2d::computeDt(const member_type& teamMember) noexcept { double reduction0; Kokkos::parallel_reduce(Kokkos::TeamThreadRange(teamMember, nbCells), KOKKOS_LAMBDA(const size_t& jCells, double& accu) { - accu = glace2dfreefuncs::minR0(accu, deltatj(jCells)); + accu = glace2dfreefuncs::minR0(accu, delta_tj(jCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &glace2dfreefuncs::minR0)); - deltat = std::min((deltatCfl * reduction0), (stopTime - t_n)); + delta_t = std::min((delta_tCfl * reduction0), (stopTime - t_n)); } /** @@ -1070,12 +1070,12 @@ void Glace2d::computeMt(const member_type& teamMember) noexcept /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Glace2d::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -1130,7 +1130,7 @@ void Glace2d::computeFjr(const member_type& teamMember) noexcept /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ void Glace2d::computeXn(const member_type& teamMember) noexcept @@ -1143,14 +1143,14 @@ void Glace2d::computeXn(const member_type& teamMember) noexcept Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, teamWork.second), KOKKOS_LAMBDA(const size_t& rNodesTeam) { int rNodes(rNodesTeam + teamWork.first); - X_nplus1(rNodes) = glace2dfreefuncs::operatorAdd(X_n(rNodes), glace2dfreefuncs::operatorMult(deltat, ur(rNodes))); + X_nplus1(rNodes) = glace2dfreefuncs::operatorAdd(X_n(rNodes), glace2dfreefuncs::operatorMult(delta_t, ur(rNodes))); }); } } /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ void Glace2d::computeEn(const member_type& teamMember) noexcept @@ -1175,14 +1175,14 @@ void Glace2d::computeEn(const member_type& teamMember) noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, glace2dfreefuncs::dot(F(jCells, rNodesOfCellJ), ur(rNodes))); } } - E_nplus1(jCells) = E_n(jCells) - (deltat / m(jCells)) * reduction0; + E_nplus1(jCells) = E_n(jCells) - (delta_t / m(jCells)) * reduction0; }); } } /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ void Glace2d::computeUn(const member_type& teamMember) noexcept @@ -1205,7 +1205,7 @@ void Glace2d::computeUn(const member_type& teamMember) noexcept reduction0 = glace2dfreefuncs::sumR1(reduction0, F(jCells, rNodesOfCellJ)); } } - uj_nplus1(jCells) = glace2dfreefuncs::operatorSub(uj_n(jCells), glace2dfreefuncs::operatorMult((deltat / m(jCells)), reduction0)); + uj_nplus1(jCells) = glace2dfreefuncs::operatorSub(uj_n(jCells), glace2dfreefuncs::operatorMult((delta_t / m(jCells)), reduction0)); }); } } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.h index fe1069c64..bef6ccdb5 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/glace2d/Glace2d.h @@ -144,15 +144,15 @@ class Glace2d int maxIterations; static constexpr double gamma = 1.4; static constexpr double xInterface = 0.5; - static constexpr double deltatCfl = 0.4; - static constexpr double rhoIniZg = 1.0; - static constexpr double rhoIniZd = 0.125; + static constexpr double delta_tCfl = 0.4; + static constexpr double rho_IniZg = 1.0; + static constexpr double rho_IniZd = 0.125; static constexpr double pIniZg = 1.0; static constexpr double pIniZd = 0.1; double t_n; double t_nplus1; double t_n0; - double deltat; + double delta_t; Kokkos::View*> X_n; Kokkos::View*> X_nplus1; Kokkos::View*> X_n0; @@ -169,7 +169,7 @@ class Glace2d Kokkos::View E_n; Kokkos::View E_nplus1; Kokkos::View V; - Kokkos::View deltatj; + Kokkos::View delta_tj; Kokkos::View*> uj_n; Kokkos::View*> uj_nplus1; Kokkos::View l; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.cc index 027023dc9..f2c84e4f2 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.cc @@ -162,7 +162,7 @@ const std::pair HeatEquation::computeTeamWorkRange(const member_ /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquation::computeOutgoingFlux(const member_type& teamMember) noexcept @@ -190,7 +190,7 @@ void HeatEquation::computeOutgoingFlux(const member_type& teamMember) noexcept reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - outgoingFlux(j1Cells) = deltat / V(j1Cells) * reduction0; + outgoingFlux(j1Cells) = delta_t / V(j1Cells) * reduction0; }); } } @@ -231,12 +231,12 @@ void HeatEquation::computeSurface(const member_type& teamMember) noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -337,7 +337,7 @@ void HeatEquation::iniTime() noexcept /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquation::computeUn(const member_type& teamMember) noexcept @@ -350,7 +350,7 @@ void HeatEquation::computeUn(const member_type& teamMember) noexcept Kokkos::parallel_for(Kokkos::TeamThreadRange(teamMember, teamWork.second), KOKKOS_LAMBDA(const size_t& jCellsTeam) { int jCells(jCellsTeam + teamWork.first); - u_nplus1(jCells) = f(jCells) * deltat + u_n(jCells) + outgoingFlux(jCells); + u_nplus1(jCells) = f(jCells) * delta_t + u_n(jCells) + outgoingFlux(jCells); }); } } @@ -445,7 +445,7 @@ void HeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.h index 2b3ff09e7..039be2cba 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/heatequation/HeatEquation.h @@ -104,7 +104,7 @@ class HeatEquation int maxIterations; static constexpr double PI = 3.1415926; static constexpr double alpha = 1.0; - static constexpr double deltat = 0.001; + static constexpr double delta_t = 0.001; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.cc index 31f054a39..d6f9dbab7 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.cc @@ -138,7 +138,7 @@ ImplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // linearAlgebra if (options.HasMember("linearAlgebra")) { @@ -216,12 +216,12 @@ void ImplicitHeatEquation::computeFaceLength(const member_type& teamMember) noex /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ImplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -333,7 +333,7 @@ void ImplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ImplicitHeatEquation::computeDeltaTn(const member_type& teamMember) noexcept { @@ -342,7 +342,7 @@ void ImplicitHeatEquation::computeDeltaTn(const member_type& teamMember) noexcep { accu = implicitheatequationfreefuncs::minR0(accu, V(cCells) / D(cCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &implicitheatequationfreefuncs::minR0)); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -427,7 +427,7 @@ void ImplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ImplicitHeatEquation::computeAlphaCoeff(const member_type& teamMember) noexcept @@ -441,7 +441,7 @@ void ImplicitHeatEquation::computeAlphaCoeff(const member_type& teamMember) noex { int cCells(cCellsTeam + teamWork.first); const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -451,12 +451,12 @@ void ImplicitHeatEquation::computeAlphaCoeff(const member_type& teamMember) noex const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(-deltat / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); - alpha.setValue(cCells, dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(-delta_t / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); + alpha.setValue(cCells, dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha.setValue(cCells, cCells, 1 - alphaDiag); + alpha.setValue(cCells, cCells, 1 - alpha_Diag); }); } } @@ -504,7 +504,7 @@ void ImplicitHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.h index 61234a890..0a412ba8c 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/implicitheatequation/ImplicitHeatEquation.h @@ -110,7 +110,7 @@ class ImplicitHeatEquation int maxIterations; static constexpr double u0 = 1.0; static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.cc index 98631eb33..e61b09854 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.cc @@ -158,7 +158,7 @@ IterativeHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -228,12 +228,12 @@ void IterativeHeatEquation::computeFaceLength(const member_type& teamMember) noe /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -387,7 +387,7 @@ void IterativeHeatEquation::updateU(const member_type& teamMember) noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquation::computeDeltaTn(const member_type& teamMember) noexcept { @@ -396,7 +396,7 @@ void IterativeHeatEquation::computeDeltaTn(const member_type& teamMember) noexce { accu = iterativeheatequationfreefuncs::minR0(accu, V(cCells) / D(cCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &iterativeheatequationfreefuncs::minR0)); - deltat = reduction0 * 0.1; + delta_t = reduction0 * 0.1; } /** @@ -536,7 +536,7 @@ void IterativeHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquation::computeAlphaCoeff(const member_type& teamMember) noexcept @@ -550,7 +550,7 @@ void IterativeHeatEquation::computeAlphaCoeff(const member_type& teamMember) noe { int cCells(cCellsTeam + teamWork.first); const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -560,12 +560,12 @@ void IterativeHeatEquation::computeAlphaCoeff(const member_type& teamMember) noe const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(deltat / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); - alpha(cCells, dCells) = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(delta_t / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); + alpha(cCells, dCells) = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha(cCells, cCells) = -alphaDiag; + alpha(cCells, cCells) = -alpha_Diag; }); } } @@ -653,7 +653,7 @@ void IterativeHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.h index 262163610..0a18f9eb0 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos-team/iterativeheatequation/IterativeHeatEquation.h @@ -117,7 +117,7 @@ class IterativeHeatEquation static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; static constexpr int maxIterationsK = 1000; static constexpr double epsilon = 1.0E-8; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.cc index e73f0265c..e5088a743 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.cc @@ -138,7 +138,7 @@ ExplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -178,12 +178,12 @@ void ExplicitHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -289,7 +289,7 @@ void ExplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquation::computeDeltaTn() noexcept { @@ -298,7 +298,7 @@ void ExplicitHeatEquation::computeDeltaTn() noexcept { accu = explicitheatequationfreefuncs::minR0(accu, V(cCells) / D(cCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &explicitheatequationfreefuncs::minR0)); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -369,7 +369,7 @@ void ExplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquation::computeAlphaCoeff() noexcept @@ -377,7 +377,7 @@ void ExplicitHeatEquation::computeAlphaCoeff() noexcept Kokkos::parallel_for(nbCells, KOKKOS_LAMBDA(const size_t& cCells) { const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -387,12 +387,12 @@ void ExplicitHeatEquation::computeAlphaCoeff() noexcept const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(deltat / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); - alpha(cCells, dCells) = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(delta_t / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); + alpha(cCells, dCells) = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha(cCells, cCells) = 1 - alphaDiag; + alpha(cCells, cCells) = 1 - alpha_Diag; }); } @@ -441,7 +441,7 @@ void ExplicitHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.h index afbbe2da9..0b199e791 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/explicitheatequation/ExplicitHeatEquation.h @@ -99,7 +99,7 @@ class ExplicitHeatEquation int maxIterations; static constexpr double u0 = 1.0; static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.cc index 7b26751e1..fc4e92285 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.cc @@ -238,7 +238,7 @@ Glace2d::Glace2d(CartesianMesh2D& aMesh) , E_n("E_n", nbCells) , E_nplus1("E_nplus1", nbCells) , V("V", nbCells) -, deltatj("deltatj", nbCells) +, delta_tj("delta_tj", nbCells) , uj_n("uj_n", nbCells) , uj_nplus1("uj_nplus1", nbCells) , l("l", nbCells, 4) @@ -411,7 +411,7 @@ void Glace2d::computeV() noexcept /** * Job initialize called @2.0 in simulate method. - * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface * Out variables: E_n, m, p, rho, uj_n */ void Glace2d::initialize() noexcept @@ -435,12 +435,12 @@ void Glace2d::initialize() noexcept const RealArray1D<2> center(glace2dfreefuncs::operatorMult(0.25, reduction0)); if (center[0] < xInterface) { - rho_ic = rhoIniZg; + rho_ic = rho_IniZg; p_ic = pIniZg; } else { - rho_ic = rhoIniZd; + rho_ic = rho_IniZd; p_ic = pIniZd; } double reduction1(0.0); @@ -571,7 +571,7 @@ void Glace2d::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); @@ -632,7 +632,7 @@ void Glace2d::computeAjr() noexcept /** * Job computedeltatj called @6.0 in executeTimeLoopN method. * In variables: V, c, l - * Out variables: deltatj + * Out variables: delta_tj */ void Glace2d::computedeltatj() noexcept { @@ -648,7 +648,7 @@ void Glace2d::computedeltatj() noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, l(jCells, rNodesOfCellJ)); } } - deltatj(jCells) = 2.0 * V(jCells) / (c(jCells) * reduction0); + delta_tj(jCells) = 2.0 * V(jCells) / (c(jCells) * reduction0); }); } @@ -715,17 +715,17 @@ void Glace2d::computeBr() noexcept /** * Job computeDt called @7.0 in executeTimeLoopN method. - * In variables: deltatCfl, deltatj, stopTime, t_n - * Out variables: deltat + * In variables: delta_tCfl, delta_tj, stopTime, t_n + * Out variables: delta_t */ void Glace2d::computeDt() noexcept { double reduction0; Kokkos::parallel_reduce(nbCells, KOKKOS_LAMBDA(const size_t& jCells, double& accu) { - accu = glace2dfreefuncs::minR0(accu, deltatj(jCells)); + accu = glace2dfreefuncs::minR0(accu, delta_tj(jCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &glace2dfreefuncs::minR0)); - deltat = std::min((deltatCfl * reduction0), (stopTime - t_n)); + delta_t = std::min((delta_tCfl * reduction0), (stopTime - t_n)); } /** @@ -843,12 +843,12 @@ void Glace2d::computeMt() noexcept /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Glace2d::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -889,20 +889,20 @@ void Glace2d::computeFjr() noexcept /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ void Glace2d::computeXn() noexcept { Kokkos::parallel_for(nbNodes, KOKKOS_LAMBDA(const size_t& rNodes) { - X_nplus1(rNodes) = glace2dfreefuncs::operatorAdd(X_n(rNodes), glace2dfreefuncs::operatorMult(deltat, ur(rNodes))); + X_nplus1(rNodes) = glace2dfreefuncs::operatorAdd(X_n(rNodes), glace2dfreefuncs::operatorMult(delta_t, ur(rNodes))); }); } /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ void Glace2d::computeEn() noexcept @@ -921,13 +921,13 @@ void Glace2d::computeEn() noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, glace2dfreefuncs::dot(F(jCells, rNodesOfCellJ), ur(rNodes))); } } - E_nplus1(jCells) = E_n(jCells) - (deltat / m(jCells)) * reduction0; + E_nplus1(jCells) = E_n(jCells) - (delta_t / m(jCells)) * reduction0; }); } /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ void Glace2d::computeUn() noexcept @@ -944,7 +944,7 @@ void Glace2d::computeUn() noexcept reduction0 = glace2dfreefuncs::sumR1(reduction0, F(jCells, rNodesOfCellJ)); } } - uj_nplus1(jCells) = glace2dfreefuncs::operatorSub(uj_n(jCells), glace2dfreefuncs::operatorMult((deltat / m(jCells)), reduction0)); + uj_nplus1(jCells) = glace2dfreefuncs::operatorSub(uj_n(jCells), glace2dfreefuncs::operatorMult((delta_t / m(jCells)), reduction0)); }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.h index f10eb2f65..f5d7f550a 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/glace2d/Glace2d.h @@ -135,15 +135,15 @@ class Glace2d int maxIterations; static constexpr double gamma = 1.4; static constexpr double xInterface = 0.5; - static constexpr double deltatCfl = 0.4; - static constexpr double rhoIniZg = 1.0; - static constexpr double rhoIniZd = 0.125; + static constexpr double delta_tCfl = 0.4; + static constexpr double rho_IniZg = 1.0; + static constexpr double rho_IniZd = 0.125; static constexpr double pIniZg = 1.0; static constexpr double pIniZd = 0.1; double t_n; double t_nplus1; double t_n0; - double deltat; + double delta_t; Kokkos::View*> X_n; Kokkos::View*> X_nplus1; Kokkos::View*> X_n0; @@ -160,7 +160,7 @@ class Glace2d Kokkos::View E_n; Kokkos::View E_nplus1; Kokkos::View V; - Kokkos::View deltatj; + Kokkos::View delta_tj; Kokkos::View*> uj_n; Kokkos::View*> uj_nplus1; Kokkos::View l; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.cc index af9265622..51e81e57b 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.cc @@ -139,7 +139,7 @@ HeatEquation::jsonInit(const char* jsonContent) /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquation::computeOutgoingFlux() noexcept @@ -161,7 +161,7 @@ void HeatEquation::computeOutgoingFlux() noexcept reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - outgoingFlux(j1Cells) = deltat / V(j1Cells) * reduction0; + outgoingFlux(j1Cells) = delta_t / V(j1Cells) * reduction0; }); } @@ -194,12 +194,12 @@ void HeatEquation::computeSurface() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -279,14 +279,14 @@ void HeatEquation::iniTime() noexcept /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquation::computeUn() noexcept { Kokkos::parallel_for(nbCells, KOKKOS_LAMBDA(const size_t& jCells) { - u_nplus1(jCells) = f(jCells) * deltat + u_n(jCells) + outgoingFlux(jCells); + u_nplus1(jCells) = f(jCells) * delta_t + u_n(jCells) + outgoingFlux(jCells); }); } @@ -359,7 +359,7 @@ void HeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.h index 73ef78c2a..ca6ede6ce 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/heatequation/HeatEquation.h @@ -95,7 +95,7 @@ class HeatEquation int maxIterations; static constexpr double PI = 3.1415926; static constexpr double alpha = 1.0; - static constexpr double deltat = 0.001; + static constexpr double delta_t = 0.001; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.cc index cb63f1a2f..bfb8433f3 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.cc @@ -138,7 +138,7 @@ ImplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // linearAlgebra if (options.HasMember("linearAlgebra")) { @@ -186,12 +186,12 @@ void ImplicitHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ImplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -282,7 +282,7 @@ void ImplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ImplicitHeatEquation::computeDeltaTn() noexcept { @@ -291,7 +291,7 @@ void ImplicitHeatEquation::computeDeltaTn() noexcept { accu = implicitheatequationfreefuncs::minR0(accu, V(cCells) / D(cCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &implicitheatequationfreefuncs::minR0)); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -362,7 +362,7 @@ void ImplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ImplicitHeatEquation::computeAlphaCoeff() noexcept @@ -370,7 +370,7 @@ void ImplicitHeatEquation::computeAlphaCoeff() noexcept Kokkos::parallel_for(nbCells, KOKKOS_LAMBDA(const size_t& cCells) { const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -380,12 +380,12 @@ void ImplicitHeatEquation::computeAlphaCoeff() noexcept const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(-deltat / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); - alpha.setValue(cCells, dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(-delta_t / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); + alpha.setValue(cCells, dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha.setValue(cCells, cCells, 1 - alphaDiag); + alpha.setValue(cCells, cCells, 1 - alpha_Diag); }); } @@ -431,7 +431,7 @@ void ImplicitHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.h index 936b45ad6..313f841ed 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/implicitheatequation/ImplicitHeatEquation.h @@ -101,7 +101,7 @@ class ImplicitHeatEquation int maxIterations; static constexpr double u0 = 1.0; static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.cc index 15c4a4f5f..7abca5919 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.cc @@ -158,7 +158,7 @@ IterativeHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -198,12 +198,12 @@ void IterativeHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -322,7 +322,7 @@ void IterativeHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquation::computeDeltaTn() noexcept { @@ -331,7 +331,7 @@ void IterativeHeatEquation::computeDeltaTn() noexcept { accu = iterativeheatequationfreefuncs::minR0(accu, V(cCells) / D(cCells)); }, KokkosJoiner(reduction0, double(numeric_limits::max()), &iterativeheatequationfreefuncs::minR0)); - deltat = reduction0 * 0.1; + delta_t = reduction0 * 0.1; } /** @@ -443,7 +443,7 @@ void IterativeHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquation::computeAlphaCoeff() noexcept @@ -451,7 +451,7 @@ void IterativeHeatEquation::computeAlphaCoeff() noexcept Kokkos::parallel_for(nbCells, KOKKOS_LAMBDA(const size_t& cCells) { const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -461,12 +461,12 @@ void IterativeHeatEquation::computeAlphaCoeff() noexcept const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(deltat / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); - alpha(cCells, dCells) = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(delta_t / V(cCells) * (faceLength(fFaces) * faceConductivity(fFaces)) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(Xc(cCells), Xc(dCells)))); + alpha(cCells, dCells) = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha(cCells, cCells) = -alphaDiag; + alpha(cCells, cCells) = -alpha_Diag; }); } @@ -530,7 +530,7 @@ void IterativeHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.h index fdeb012fd..d523c6698 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/kokkos/iterativeheatequation/IterativeHeatEquation.h @@ -108,7 +108,7 @@ class IterativeHeatEquation static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; static constexpr int maxIterationsK = 1000; static constexpr double epsilon = 1.0E-8; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/explicitheatequation/ExplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/explicitheatequation/ExplicitHeatEquation.cc index 31c6a6074..628ec46b3 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/explicitheatequation/ExplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/explicitheatequation/ExplicitHeatEquation.cc @@ -141,7 +141,7 @@ ExplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -182,12 +182,12 @@ void ExplicitHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -297,7 +297,7 @@ void ExplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquation::computeDeltaTn() noexcept { @@ -307,7 +307,7 @@ void ExplicitHeatEquation::computeDeltaTn() noexcept { reduction0 = explicitheatequationfreefuncs::minR0(reduction0, V[cCells] / D[cCells]); } - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -380,7 +380,7 @@ void ExplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquation::computeAlphaCoeff() noexcept @@ -389,7 +389,7 @@ void ExplicitHeatEquation::computeAlphaCoeff() noexcept for (size_t cCells=0; cCells vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/glace2d/Glace2d.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/glace2d/Glace2d.cc index 9548bad39..3cd7710b8 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/glace2d/Glace2d.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/glace2d/Glace2d.cc @@ -248,7 +248,7 @@ Glace2d::Glace2d(CartesianMesh2D& aMesh) , E_n(nbCells) , E_nplus1(nbCells) , V(nbCells) -, deltatj(nbCells) +, delta_tj(nbCells) , uj_n(nbCells) , uj_nplus1(nbCells) , l(nbCells, std::vector(4)) @@ -426,7 +426,7 @@ void Glace2d::computeV() noexcept /** * Job initialize called @2.0 in simulate method. - * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface * Out variables: E_n, m, p, rho, uj_n */ void Glace2d::initialize() noexcept @@ -451,12 +451,12 @@ void Glace2d::initialize() noexcept const RealArray1D<2> center(glace2dfreefuncs::operatorMult(0.25, reduction0)); if (center[0] < xInterface) { - rho_ic = rhoIniZg; + rho_ic = rho_IniZg; p_ic = pIniZg; } else { - rho_ic = rhoIniZd; + rho_ic = rho_IniZd; p_ic = pIniZd; } double reduction1(0.0); @@ -592,7 +592,7 @@ void Glace2d::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); @@ -656,7 +656,7 @@ void Glace2d::computeAjr() noexcept /** * Job computedeltatj called @6.0 in executeTimeLoopN method. * In variables: V, c, l - * Out variables: deltatj + * Out variables: delta_tj */ void Glace2d::computedeltatj() noexcept { @@ -673,7 +673,7 @@ void Glace2d::computedeltatj() noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, l[jCells][rNodesOfCellJ]); } } - deltatj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); + delta_tj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); } } @@ -742,8 +742,8 @@ void Glace2d::computeBr() noexcept /** * Job computeDt called @7.0 in executeTimeLoopN method. - * In variables: deltatCfl, deltatj, stopTime, t_n - * Out variables: deltat + * In variables: delta_tCfl, delta_tj, stopTime, t_n + * Out variables: delta_t */ void Glace2d::computeDt() noexcept { @@ -751,9 +751,9 @@ void Glace2d::computeDt() noexcept #pragma omp parallel for reduction(min:reduction0) for (size_t jCells=0; jCells> X_n; std::vector> X_nplus1; std::vector> X_n0; @@ -157,7 +157,7 @@ class Glace2d std::vector E_n; std::vector E_nplus1; std::vector V; - std::vector deltatj; + std::vector delta_tj; std::vector> uj_n; std::vector> uj_nplus1; std::vector> l; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/heatequation/HeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/heatequation/HeatEquation.cc index fcadd70a9..457ab5ad0 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/heatequation/HeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/heatequation/HeatEquation.cc @@ -142,7 +142,7 @@ HeatEquation::jsonInit(const char* jsonContent) /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquation::computeOutgoingFlux() noexcept @@ -165,7 +165,7 @@ void HeatEquation::computeOutgoingFlux() noexcept reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - outgoingFlux[j1Cells] = deltat / V[j1Cells] * reduction0; + outgoingFlux[j1Cells] = delta_t / V[j1Cells] * reduction0; } } @@ -199,12 +199,12 @@ void HeatEquation::computeSurface() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -287,7 +287,7 @@ void HeatEquation::iniTime() noexcept /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquation::computeUn() noexcept @@ -295,7 +295,7 @@ void HeatEquation::computeUn() noexcept #pragma omp parallel for for (size_t jCells=0; jCells vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/iterativeheatequation/IterativeHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/iterativeheatequation/IterativeHeatEquation.cc index 157cc5d26..1fbe3fede 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/iterativeheatequation/IterativeHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/openmp/iterativeheatequation/IterativeHeatEquation.cc @@ -161,7 +161,7 @@ IterativeHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -202,12 +202,12 @@ void IterativeHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -331,7 +331,7 @@ void IterativeHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquation::computeDeltaTn() noexcept { @@ -341,7 +341,7 @@ void IterativeHeatEquation::computeDeltaTn() noexcept { reduction0 = iterativeheatequationfreefuncs::minR0(reduction0, V[cCells] / D[cCells]); } - deltat = reduction0 * 0.1; + delta_t = reduction0 * 0.1; } /** @@ -457,7 +457,7 @@ void IterativeHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquation::computeAlphaCoeff() noexcept @@ -466,7 +466,7 @@ void IterativeHeatEquation::computeAlphaCoeff() noexcept for (size_t cCells=0; cCells vectOne = {1.0, 1.0}; static constexpr int maxIterationsK = 1000; static constexpr double epsilon = 1.0E-8; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/explicitheatequation/ExplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/explicitheatequation/ExplicitHeatEquation.cc index fc34cc0ca..b6fd9eea4 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/explicitheatequation/ExplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/explicitheatequation/ExplicitHeatEquation.cc @@ -138,7 +138,7 @@ ExplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -178,12 +178,12 @@ void ExplicitHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -289,7 +289,7 @@ void ExplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquation::computeDeltaTn() noexcept { @@ -298,7 +298,7 @@ void ExplicitHeatEquation::computeDeltaTn() noexcept { reduction0 = explicitheatequationfreefuncs::minR0(reduction0, V[cCells] / D[cCells]); } - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -369,7 +369,7 @@ void ExplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquation::computeAlphaCoeff() noexcept @@ -377,7 +377,7 @@ void ExplicitHeatEquation::computeAlphaCoeff() noexcept for (size_t cCells=0; cCells vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/glace2d/Glace2d.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/glace2d/Glace2d.cc index c624a93cc..1542cef06 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/glace2d/Glace2d.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/glace2d/Glace2d.cc @@ -238,7 +238,7 @@ Glace2d::Glace2d(CartesianMesh2D& aMesh) , E_n(nbCells) , E_nplus1(nbCells) , V(nbCells) -, deltatj(nbCells) +, delta_tj(nbCells) , uj_n(nbCells) , uj_nplus1(nbCells) , l(nbCells, std::vector(4)) @@ -411,7 +411,7 @@ void Glace2d::computeV() noexcept /** * Job initialize called @2.0 in simulate method. - * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface * Out variables: E_n, m, p, rho, uj_n */ void Glace2d::initialize() noexcept @@ -435,12 +435,12 @@ void Glace2d::initialize() noexcept const RealArray1D<2> center(glace2dfreefuncs::operatorMult(0.25, reduction0)); if (center[0] < xInterface) { - rho_ic = rhoIniZg; + rho_ic = rho_IniZg; p_ic = pIniZg; } else { - rho_ic = rhoIniZd; + rho_ic = rho_IniZd; p_ic = pIniZd; } double reduction1(0.0); @@ -571,7 +571,7 @@ void Glace2d::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); @@ -632,7 +632,7 @@ void Glace2d::computeAjr() noexcept /** * Job computedeltatj called @6.0 in executeTimeLoopN method. * In variables: V, c, l - * Out variables: deltatj + * Out variables: delta_tj */ void Glace2d::computedeltatj() noexcept { @@ -648,7 +648,7 @@ void Glace2d::computedeltatj() noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, l[jCells][rNodesOfCellJ]); } } - deltatj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); + delta_tj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); } } @@ -715,17 +715,17 @@ void Glace2d::computeBr() noexcept /** * Job computeDt called @7.0 in executeTimeLoopN method. - * In variables: deltatCfl, deltatj, stopTime, t_n - * Out variables: deltat + * In variables: delta_tCfl, delta_tj, stopTime, t_n + * Out variables: delta_t */ void Glace2d::computeDt() noexcept { double reduction0(numeric_limits::max()); for (size_t jCells=0; jCells> X_n; std::vector> X_nplus1; std::vector> X_n0; @@ -156,7 +156,7 @@ class Glace2d std::vector E_n; std::vector E_nplus1; std::vector V; - std::vector deltatj; + std::vector delta_tj; std::vector> uj_n; std::vector> uj_nplus1; std::vector> l; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/heatequation/HeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/heatequation/HeatEquation.cc index 5881b9d04..8135efe04 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/heatequation/HeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/heatequation/HeatEquation.cc @@ -139,7 +139,7 @@ HeatEquation::jsonInit(const char* jsonContent) /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquation::computeOutgoingFlux() noexcept @@ -161,7 +161,7 @@ void HeatEquation::computeOutgoingFlux() noexcept reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - outgoingFlux[j1Cells] = deltat / V[j1Cells] * reduction0; + outgoingFlux[j1Cells] = delta_t / V[j1Cells] * reduction0; } } @@ -194,12 +194,12 @@ void HeatEquation::computeSurface() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -279,14 +279,14 @@ void HeatEquation::iniTime() noexcept /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquation::computeUn() noexcept { for (size_t jCells=0; jCells vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/iterativeheatequation/IterativeHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/iterativeheatequation/IterativeHeatEquation.cc index ef8c9bc7e..4928a4ff8 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/iterativeheatequation/IterativeHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/sequential/iterativeheatequation/IterativeHeatEquation.cc @@ -158,7 +158,7 @@ IterativeHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -198,12 +198,12 @@ void IterativeHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -322,7 +322,7 @@ void IterativeHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquation::computeDeltaTn() noexcept { @@ -331,7 +331,7 @@ void IterativeHeatEquation::computeDeltaTn() noexcept { reduction0 = iterativeheatequationfreefuncs::minR0(reduction0, V[cCells] / D[cCells]); } - deltat = reduction0 * 0.1; + delta_t = reduction0 * 0.1; } /** @@ -443,7 +443,7 @@ void IterativeHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquation::computeAlphaCoeff() noexcept @@ -451,7 +451,7 @@ void IterativeHeatEquation::computeAlphaCoeff() noexcept for (size_t cCells=0; cCells vectOne = {1.0, 1.0}; static constexpr int maxIterationsK = 1000; static constexpr double epsilon = 1.0E-8; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.cc index c8d65783e..1cab51f44 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.cc @@ -147,7 +147,7 @@ ExplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -190,12 +190,12 @@ void ExplicitHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ExplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -313,7 +313,7 @@ void ExplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ExplicitHeatEquation::computeDeltaTn() noexcept { @@ -323,7 +323,7 @@ void ExplicitHeatEquation::computeDeltaTn() noexcept return (accu = explicitheatequationfreefuncs::minR0(accu, V[cCells] / D[cCells])); }, &explicitheatequationfreefuncs::minR0); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -400,7 +400,7 @@ void ExplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ExplicitHeatEquation::computeAlphaCoeff() noexcept @@ -409,7 +409,7 @@ void ExplicitHeatEquation::computeAlphaCoeff() noexcept const std::function loopLambda = [&] (const size_t& cCells) { const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -419,12 +419,12 @@ void ExplicitHeatEquation::computeAlphaCoeff() noexcept const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(deltat / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(Xc[cCells], Xc[dCells]))); - alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(delta_t / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / explicitheatequationfreefuncs::norm(explicitheatequationfreefuncs::operatorSub(Xc[cCells], Xc[dCells]))); + alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha[cCells][cCells] = 1 - alphaDiag; + alpha[cCells][cCells] = 1 - alpha_Diag; }; parallel_exec(nbCells, loopLambda); } @@ -478,7 +478,7 @@ void ExplicitHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.h index c1a3e4042..fa5153441 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/explicitheatequation/ExplicitHeatEquation.h @@ -97,7 +97,7 @@ class ExplicitHeatEquation int maxIterations; static constexpr double u0 = 1.0; static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.cc index 989035bbe..f468e32c8 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.cc @@ -268,7 +268,7 @@ Glace2d::Glace2d(CartesianMesh2D& aMesh) , E_n(nbCells) , E_nplus1(nbCells) , V(nbCells) -, deltatj(nbCells) +, delta_tj(nbCells) , uj_n(nbCells) , uj_nplus1(nbCells) , l(nbCells, std::vector(4)) @@ -456,7 +456,7 @@ void Glace2d::computeV() noexcept /** * Job initialize called @2.0 in simulate method. - * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface * Out variables: E_n, m, p, rho, uj_n */ void Glace2d::initialize() noexcept @@ -481,12 +481,12 @@ void Glace2d::initialize() noexcept const RealArray1D<2> center(glace2dfreefuncs::operatorMult(0.25, reduction0)); if (center[0] < xInterface) { - rho_ic = rhoIniZg; + rho_ic = rho_IniZg; p_ic = pIniZg; } else { - rho_ic = rhoIniZd; + rho_ic = rho_IniZd; p_ic = pIniZd; } double reduction1(0.0); @@ -634,7 +634,7 @@ void Glace2d::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); @@ -704,7 +704,7 @@ void Glace2d::computeAjr() noexcept /** * Job computedeltatj called @6.0 in executeTimeLoopN method. * In variables: V, c, l - * Out variables: deltatj + * Out variables: delta_tj */ void Glace2d::computedeltatj() noexcept { @@ -721,7 +721,7 @@ void Glace2d::computedeltatj() noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, l[jCells][rNodesOfCellJ]); } } - deltatj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); + delta_tj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); }; parallel_exec(nbCells, loopLambda); } @@ -796,18 +796,18 @@ void Glace2d::computeBr() noexcept /** * Job computeDt called @7.0 in executeTimeLoopN method. - * In variables: deltatCfl, deltatj, stopTime, t_n - * Out variables: deltat + * In variables: delta_tCfl, delta_tj, stopTime, t_n + * Out variables: delta_t */ void Glace2d::computeDt() noexcept { double reduction0; reduction0 = parallel_reduce(nbCells, double(numeric_limits::max()), [&](double& accu, const size_t& jCells) { - return (accu = glace2dfreefuncs::minR0(accu, deltatj[jCells])); + return (accu = glace2dfreefuncs::minR0(accu, delta_tj[jCells])); }, &glace2dfreefuncs::minR0); - deltat = std::min((deltatCfl * reduction0), (stopTime - t_n)); + delta_t = std::min((delta_tCfl * reduction0), (stopTime - t_n)); } /** @@ -943,12 +943,12 @@ void Glace2d::computeMt() noexcept /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Glace2d::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -995,7 +995,7 @@ void Glace2d::computeFjr() noexcept /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ void Glace2d::computeXn() noexcept @@ -1003,7 +1003,7 @@ void Glace2d::computeXn() noexcept { const std::function loopLambda = [&] (const size_t& rNodes) { - X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(X_n[rNodes], glace2dfreefuncs::operatorMult(deltat, ur[rNodes])); + X_nplus1[rNodes] = glace2dfreefuncs::operatorAdd(X_n[rNodes], glace2dfreefuncs::operatorMult(delta_t, ur[rNodes])); }; parallel_exec(nbNodes, loopLambda); } @@ -1011,7 +1011,7 @@ void Glace2d::computeXn() noexcept /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ void Glace2d::computeEn() noexcept @@ -1031,7 +1031,7 @@ void Glace2d::computeEn() noexcept reduction0 = glace2dfreefuncs::sumR0(reduction0, glace2dfreefuncs::dot(F[jCells][rNodesOfCellJ], ur[rNodes])); } } - E_nplus1[jCells] = E_n[jCells] - (deltat / m[jCells]) * reduction0; + E_nplus1[jCells] = E_n[jCells] - (delta_t / m[jCells]) * reduction0; }; parallel_exec(nbCells, loopLambda); } @@ -1039,7 +1039,7 @@ void Glace2d::computeEn() noexcept /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ void Glace2d::computeUn() noexcept @@ -1057,7 +1057,7 @@ void Glace2d::computeUn() noexcept reduction0 = glace2dfreefuncs::sumR1(reduction0, F[jCells][rNodesOfCellJ]); } } - uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(uj_n[jCells], glace2dfreefuncs::operatorMult((deltat / m[jCells]), reduction0)); + uj_nplus1[jCells] = glace2dfreefuncs::operatorSub(uj_n[jCells], glace2dfreefuncs::operatorMult((delta_t / m[jCells]), reduction0)); }; parallel_exec(nbCells, loopLambda); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.h index b2a662abf..fdae22492 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/glace2d/Glace2d.h @@ -133,15 +133,15 @@ class Glace2d int maxIterations; static constexpr double gamma = 1.4; static constexpr double xInterface = 0.5; - static constexpr double deltatCfl = 0.4; - static constexpr double rhoIniZg = 1.0; - static constexpr double rhoIniZd = 0.125; + static constexpr double delta_tCfl = 0.4; + static constexpr double rho_IniZg = 1.0; + static constexpr double rho_IniZd = 0.125; static constexpr double pIniZg = 1.0; static constexpr double pIniZd = 0.1; double t_n; double t_nplus1; double t_n0; - double deltat; + double delta_t; std::vector> X_n; std::vector> X_nplus1; std::vector> X_n0; @@ -158,7 +158,7 @@ class Glace2d std::vector E_n; std::vector E_nplus1; std::vector V; - std::vector deltatj; + std::vector delta_tj; std::vector> uj_n; std::vector> uj_nplus1; std::vector> l; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.cc index dba85b926..320a84a1a 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.cc @@ -148,7 +148,7 @@ HeatEquation::jsonInit(const char* jsonContent) /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ void HeatEquation::computeOutgoingFlux() noexcept @@ -171,7 +171,7 @@ void HeatEquation::computeOutgoingFlux() noexcept reduction0 = heatequationfreefuncs::sumR0(reduction0, reduction1); } } - outgoingFlux[j1Cells] = deltat / V[j1Cells] * reduction0; + outgoingFlux[j1Cells] = delta_t / V[j1Cells] * reduction0; }; parallel_exec(nbCells, loopLambda); } @@ -209,12 +209,12 @@ void HeatEquation::computeSurface() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void HeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -303,7 +303,7 @@ void HeatEquation::iniTime() noexcept /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ void HeatEquation::computeUn() noexcept @@ -311,7 +311,7 @@ void HeatEquation::computeUn() noexcept { const std::function loopLambda = [&] (const size_t& jCells) { - u_nplus1[jCells] = f[jCells] * deltat + u_n[jCells] + outgoingFlux[jCells]; + u_nplus1[jCells] = f[jCells] * delta_t + u_n[jCells] + outgoingFlux[jCells]; }; parallel_exec(nbCells, loopLambda); } @@ -392,7 +392,7 @@ void HeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.h index 3d1ecac11..738c6fa08 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/heatequation/HeatEquation.h @@ -93,7 +93,7 @@ class HeatEquation int maxIterations; static constexpr double PI = 3.1415926; static constexpr double alpha = 1.0; - static constexpr double deltat = 0.001; + static constexpr double delta_t = 0.001; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.cc index 22ca025c5..bef4e3191 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.cc @@ -147,7 +147,7 @@ ImplicitHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // linearAlgebra if (options.HasMember("linearAlgebra")) { @@ -198,12 +198,12 @@ void ImplicitHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void ImplicitHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -303,7 +303,7 @@ void ImplicitHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void ImplicitHeatEquation::computeDeltaTn() noexcept { @@ -313,7 +313,7 @@ void ImplicitHeatEquation::computeDeltaTn() noexcept return (accu = implicitheatequationfreefuncs::minR0(accu, V[cCells] / D[cCells])); }, &implicitheatequationfreefuncs::minR0); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -390,7 +390,7 @@ void ImplicitHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void ImplicitHeatEquation::computeAlphaCoeff() noexcept @@ -399,7 +399,7 @@ void ImplicitHeatEquation::computeAlphaCoeff() noexcept const std::function loopLambda = [&] (const size_t& cCells) { const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -409,12 +409,12 @@ void ImplicitHeatEquation::computeAlphaCoeff() noexcept const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(-deltat / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(Xc[cCells], Xc[dCells]))); - alpha.setValue(cCells, dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(-delta_t / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / implicitheatequationfreefuncs::norm(implicitheatequationfreefuncs::operatorSub(Xc[cCells], Xc[dCells]))); + alpha.setValue(cCells, dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha.setValue(cCells, cCells, 1 - alphaDiag); + alpha.setValue(cCells, cCells, 1 - alpha_Diag); }; parallel_exec(nbCells, loopLambda); } @@ -462,7 +462,7 @@ void ImplicitHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.h index 0ae4c60fa..32938db64 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/implicitheatequation/ImplicitHeatEquation.h @@ -99,7 +99,7 @@ class ImplicitHeatEquation int maxIterations; static constexpr double u0 = 1.0; static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.cc b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.cc index 679b1b3b9..ea141e7f0 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.cc +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.cc @@ -167,7 +167,7 @@ IterativeHeatEquation::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxIterations = options["maxIterations"]; assert(valueof_maxIterations.IsInt()); maxIterations = valueof_maxIterations.GetInt(); - deltat = 0.001; + delta_t = 0.001; // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); @@ -210,12 +210,12 @@ void IterativeHeatEquation::computeFaceLength() noexcept /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterativeHeatEquation::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -349,7 +349,7 @@ void IterativeHeatEquation::updateU() noexcept /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ void IterativeHeatEquation::computeDeltaTn() noexcept { @@ -359,7 +359,7 @@ void IterativeHeatEquation::computeDeltaTn() noexcept return (accu = iterativeheatequationfreefuncs::minR0(accu, V[cCells] / D[cCells])); }, &iterativeheatequationfreefuncs::minR0); - deltat = reduction0 * 0.1; + delta_t = reduction0 * 0.1; } /** @@ -481,7 +481,7 @@ void IterativeHeatEquation::setUpTimeLoopN() noexcept /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ void IterativeHeatEquation::computeAlphaCoeff() noexcept @@ -490,7 +490,7 @@ void IterativeHeatEquation::computeAlphaCoeff() noexcept const std::function loopLambda = [&] (const size_t& cCells) { const Id cId(cCells); - double alphaDiag(0.0); + double alpha_Diag(0.0); { const auto neighbourCellsC(mesh.getNeighbourCells(cId)); const size_t nbNeighbourCellsC(neighbourCellsC.size()); @@ -500,12 +500,12 @@ void IterativeHeatEquation::computeAlphaCoeff() noexcept const size_t dCells(dId); const Id fId(mesh.getCommonFace(cId, dId)); const size_t fFaces(fId); - const double alphaExtraDiag(deltat / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(Xc[cCells], Xc[dCells]))); - alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + const double alpha_ExtraDiag(delta_t / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / iterativeheatequationfreefuncs::norm(iterativeheatequationfreefuncs::operatorSub(Xc[cCells], Xc[dCells]))); + alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha[cCells][cCells] = -alphaDiag; + alpha[cCells][cCells] = -alpha_Diag; }; parallel_exec(nbCells, loopLambda); } @@ -577,7 +577,7 @@ void IterativeHeatEquation::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterations, t_n, stopTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterations, t_n, stopTime, deltat, globalTimer), true) + eta(n, maxIterations, t_n, stopTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.h b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.h index fcd707f1c..c7543356a 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.h +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-cpp/stl-thread/iterativeheatequation/IterativeHeatEquation.h @@ -106,7 +106,7 @@ class IterativeHeatEquation static constexpr RealArray1D<2> vectOne = {1.0, 1.0}; static constexpr int maxIterationsK = 1000; static constexpr double epsilon = 1.0E-8; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/explicitheatequation/ExplicitHeatEquation.java b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/explicitheatequation/ExplicitHeatEquation.java index 608b21706..f442c87d9 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/explicitheatequation/ExplicitHeatEquation.java +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/explicitheatequation/ExplicitHeatEquation.java @@ -29,7 +29,7 @@ public final class ExplicitHeatEquation int maxIterations; static final double u0 = 1.0; static final double[] vectOne = new double[] {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; @@ -74,7 +74,7 @@ public void jsonInit(final String jsonContent) final JsonElement valueof_maxIterations = options.get("maxIterations"); assert(valueof_maxIterations.isJsonPrimitive()); maxIterations = valueof_maxIterations.getAsJsonPrimitive().getAsInt(); - deltat = 0.001; + delta_t = 0.001; X = new double[nbNodes][2]; Xc = new double[nbCells][2]; u_n = new double[nbCells]; @@ -123,12 +123,12 @@ protected void computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ protected void computeTn() { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -234,7 +234,7 @@ protected void updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ protected void computeDeltaTn() { @@ -248,7 +248,7 @@ protected void computeDeltaTn() }, (r1, r2) -> minR0(r1, r2) ); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -315,7 +315,7 @@ protected void setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ protected void computeAlphaCoeff() @@ -323,7 +323,7 @@ protected void computeAlphaCoeff() IntStream.range(0, nbCells).parallel().forEach(cCells -> { final int cId = cCells; - double alphaDiag = 0.0; + double alpha_Diag = 0.0; { final int[] neighbourCellsC = mesh.getNeighbourCells(cId); final int nbNeighbourCellsC = neighbourCellsC.length; @@ -333,12 +333,12 @@ protected void computeAlphaCoeff() final int dCells = dId; final int fId = mesh.getCommonFace(cId, dId); final int fFaces = fId; - final double alphaExtraDiag = deltat / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / norm(operatorSub(Xc[cCells], Xc[dCells])); - alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + final double alpha_ExtraDiag = delta_t / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / norm(operatorSub(Xc[cCells], Xc[dCells])); + alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha[cCells][cCells] = 1 - alphaDiag; + alpha[cCells][cCells] = 1 - alpha_Diag; }); } @@ -354,7 +354,7 @@ protected void executeTimeLoopN() do { n++; - System.out.printf("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n", n, t_n, deltat); + System.out.printf("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n", n, t_n, delta_t); if (n >= lastDump + outputPeriod) dumpVariables(n); @@ -371,7 +371,7 @@ protected void executeTimeLoopN() }); } while (continueLoop); - System.out.printf("FINAL TIME: %5.5f - deltat: %5.5f\n", t_n, deltat); + System.out.printf("FINAL TIME: %5.5f - delta_t: %5.5f\n", t_n, delta_t); dumpVariables(n+1); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/glace2d/Glace2d.java b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/glace2d/Glace2d.java index 1bd83a3b4..e650187ea 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/glace2d/Glace2d.java +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/glace2d/Glace2d.java @@ -33,15 +33,15 @@ public final class Glace2d int maxIterations; static final double gamma = 1.4; static final double xInterface = 0.5; - static final double deltatCfl = 0.4; - static final double rhoIniZg = 1.0; - static final double rhoIniZd = 0.125; + static final double delta_tCfl = 0.4; + static final double rho_IniZg = 1.0; + static final double rho_IniZd = 0.125; static final double pIniZg = 1.0; static final double pIniZd = 0.1; double t_n; double t_nplus1; double t_n0; - double deltat; + double delta_t; double[][] X_n; double[][] X_nplus1; double[][] X_n0; @@ -58,7 +58,7 @@ public final class Glace2d double[] E_n; double[] E_nplus1; double[] V; - double[] deltatj; + double[] delta_tj; double[][] uj_n; double[][] uj_nplus1; double[][] l; @@ -118,7 +118,7 @@ public void jsonInit(final String jsonContent) E_n = new double[nbCells]; E_nplus1 = new double[nbCells]; V = new double[nbCells]; - deltatj = new double[nbCells]; + delta_tj = new double[nbCells]; uj_n = new double[nbCells][2]; uj_nplus1 = new double[nbCells][2]; l = new double[nbCells][4]; @@ -257,7 +257,7 @@ protected void computeV() /** * Job initialize called @2.0 in simulate method. - * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + * In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface * Out variables: E_n, m, p, rho, uj_n */ protected void initialize() @@ -281,12 +281,12 @@ protected void initialize() final double[] center = operatorMult(0.25, reduction0); if (center[0] < xInterface) { - rho_ic = rhoIniZg; + rho_ic = rho_IniZg; p_ic = pIniZg; } else { - rho_ic = rhoIniZd; + rho_ic = rho_IniZd; p_ic = pIniZd; } double reduction1 = 0.0; @@ -351,7 +351,7 @@ protected void executeTimeLoopN() do { n++; - System.out.printf("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n", n, t_n, deltat); + System.out.printf("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n", n, t_n, delta_t); if (n >= lastDump + outputPeriod) dumpVariables(n); @@ -401,7 +401,7 @@ protected void executeTimeLoopN() }); } while (continueLoop); - System.out.printf("FINAL TIME: %5.5f - deltat: %5.5f\n", t_n, deltat); + System.out.printf("FINAL TIME: %5.5f - delta_t: %5.5f\n", t_n, delta_t); dumpVariables(n+1); } @@ -455,7 +455,7 @@ protected void computeAjr() /** * Job computedeltatj called @6.0 in executeTimeLoopN method. * In variables: V, c, l - * Out variables: deltatj + * Out variables: delta_tj */ protected void computedeltatj() { @@ -471,7 +471,7 @@ protected void computedeltatj() reduction0 = sumR0(reduction0, l[jCells][rNodesOfCellJ]); } } - deltatj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); + delta_tj[jCells] = 2.0 * V[jCells] / (c[jCells] * reduction0); }); } @@ -538,8 +538,8 @@ protected void computeBr() /** * Job computeDt called @7.0 in executeTimeLoopN method. - * In variables: deltatCfl, deltatj, stopTime, t_n - * Out variables: deltat + * In variables: delta_tCfl, delta_tj, stopTime, t_n + * Out variables: delta_t */ protected void computeDt() { @@ -549,11 +549,11 @@ protected void computeDt() Double.MAX_VALUE, (accu, jCells) -> { - return minR0(accu, deltatj[jCells]); + return minR0(accu, delta_tj[jCells]); }, (r1, r2) -> minR0(r1, r2) ); - deltat = Math.min((deltatCfl * reduction0), (stopTime - t_n)); + delta_t = Math.min((delta_tCfl * reduction0), (stopTime - t_n)); } /** @@ -671,12 +671,12 @@ protected void computeMt() /** * Job computeTn called @8.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ protected void computeTn() { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -717,20 +717,20 @@ protected void computeFjr() /** * Job computeXn called @10.0 in executeTimeLoopN method. - * In variables: X_n, deltat, ur + * In variables: X_n, delta_t, ur * Out variables: X_nplus1 */ protected void computeXn() { IntStream.range(0, nbNodes).parallel().forEach(rNodes -> { - X_nplus1[rNodes] = operatorAdd(X_n[rNodes], operatorMult(deltat, ur[rNodes])); + X_nplus1[rNodes] = operatorAdd(X_n[rNodes], operatorMult(delta_t, ur[rNodes])); }); } /** * Job computeEn called @11.0 in executeTimeLoopN method. - * In variables: E_n, F, deltat, m, ur + * In variables: E_n, F, delta_t, m, ur * Out variables: E_nplus1 */ protected void computeEn() @@ -749,13 +749,13 @@ protected void computeEn() reduction0 = sumR0(reduction0, dot(F[jCells][rNodesOfCellJ], ur[rNodes])); } } - E_nplus1[jCells] = E_n[jCells] - (deltat / m[jCells]) * reduction0; + E_nplus1[jCells] = E_n[jCells] - (delta_t / m[jCells]) * reduction0; }); } /** * Job computeUn called @11.0 in executeTimeLoopN method. - * In variables: F, deltat, m, uj_n + * In variables: F, delta_t, m, uj_n * Out variables: uj_nplus1 */ protected void computeUn() @@ -772,7 +772,7 @@ protected void computeUn() reduction0 = sumR1(reduction0, F[jCells][rNodesOfCellJ]); } } - uj_nplus1[jCells] = operatorSub(uj_n[jCells], operatorMult((deltat / m[jCells]), reduction0)); + uj_nplus1[jCells] = operatorSub(uj_n[jCells], operatorMult((delta_t / m[jCells]), reduction0)); }); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/heatequation/HeatEquation.java b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/heatequation/HeatEquation.java index 3de0d554a..d4f275135 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/heatequation/HeatEquation.java +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/heatequation/HeatEquation.java @@ -29,7 +29,7 @@ public final class HeatEquation int maxIterations; static final double PI = 3.1415926; static final double alpha = 1.0; - static final double deltat = 0.001; + static final double delta_t = 0.001; double t_n; double t_nplus1; double t_n0; @@ -93,7 +93,7 @@ public void jsonInit(final String jsonContent) /** * Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - * In variables: V, center, deltat, surface, u_n + * In variables: V, center, delta_t, surface, u_n * Out variables: outgoingFlux */ protected void computeOutgoingFlux() @@ -115,7 +115,7 @@ protected void computeOutgoingFlux() reduction0 = sumR0(reduction0, reduction1); } } - outgoingFlux[j1Cells] = deltat / V[j1Cells] * reduction0; + outgoingFlux[j1Cells] = delta_t / V[j1Cells] * reduction0; }); } @@ -148,12 +148,12 @@ protected void computeSurface() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ protected void computeTn() { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -233,14 +233,14 @@ protected void iniTime() /** * Job computeUn called @2.0 in executeTimeLoopN method. - * In variables: deltat, f, outgoingFlux, u_n + * In variables: delta_t, f, outgoingFlux, u_n * Out variables: u_nplus1 */ protected void computeUn() { IntStream.range(0, nbCells).parallel().forEach(jCells -> { - u_nplus1[jCells] = f[jCells] * deltat + u_n[jCells] + outgoingFlux[jCells]; + u_nplus1[jCells] = f[jCells] * delta_t + u_n[jCells] + outgoingFlux[jCells]; }); } @@ -279,7 +279,7 @@ protected void executeTimeLoopN() do { n++; - System.out.printf("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n", n, t_n, deltat); + System.out.printf("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n", n, t_n, delta_t); if (n >= lastDump + outputPeriod) dumpVariables(n); @@ -297,7 +297,7 @@ protected void executeTimeLoopN() }); } while (continueLoop); - System.out.printf("FINAL TIME: %5.5f - deltat: %5.5f\n", t_n, deltat); + System.out.printf("FINAL TIME: %5.5f - delta_t: %5.5f\n", t_n, delta_t); dumpVariables(n+1); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/implicitheatequation/ImplicitHeatEquation.java b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/implicitheatequation/ImplicitHeatEquation.java index c5f14d777..c44754589 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/implicitheatequation/ImplicitHeatEquation.java +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/implicitheatequation/ImplicitHeatEquation.java @@ -30,7 +30,7 @@ public final class ImplicitHeatEquation int maxIterations; static final double u0 = 1.0; static final double[] vectOne = new double[] {1.0, 1.0}; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; @@ -75,7 +75,7 @@ public void jsonInit(final String jsonContent) final JsonElement valueof_maxIterations = options.get("maxIterations"); assert(valueof_maxIterations.isJsonPrimitive()); maxIterations = valueof_maxIterations.getAsJsonPrimitive().getAsInt(); - deltat = 0.001; + delta_t = 0.001; X = new double[nbNodes][2]; Xc = new double[nbCells][2]; u_n = new linearalgebrajava.Vector("u_n", nbCells); @@ -128,12 +128,12 @@ protected void computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ protected void computeTn() { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -224,7 +224,7 @@ protected void updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ protected void computeDeltaTn() { @@ -238,7 +238,7 @@ protected void computeDeltaTn() }, (r1, r2) -> minR0(r1, r2) ); - deltat = reduction0 * 0.24; + delta_t = reduction0 * 0.24; } /** @@ -305,7 +305,7 @@ protected void setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ protected void computeAlphaCoeff() @@ -313,7 +313,7 @@ protected void computeAlphaCoeff() IntStream.range(0, nbCells).parallel().forEach(cCells -> { final int cId = cCells; - double alphaDiag = 0.0; + double alpha_Diag = 0.0; { final int[] neighbourCellsC = mesh.getNeighbourCells(cId); final int nbNeighbourCellsC = neighbourCellsC.length; @@ -323,12 +323,12 @@ protected void computeAlphaCoeff() final int dCells = dId; final int fId = mesh.getCommonFace(cId, dId); final int fFaces = fId; - final double alphaExtraDiag = -deltat / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / norm(operatorSub(Xc[cCells], Xc[dCells])); - alpha.setValue(cCells, dCells, alphaExtraDiag); - alphaDiag = alphaDiag + alphaExtraDiag; + final double alpha_ExtraDiag = -delta_t / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / norm(operatorSub(Xc[cCells], Xc[dCells])); + alpha.setValue(cCells, dCells, alpha_ExtraDiag); + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha.setValue(cCells, cCells, 1 - alphaDiag); + alpha.setValue(cCells, cCells, 1 - alpha_Diag); }); } @@ -344,7 +344,7 @@ protected void executeTimeLoopN() do { n++; - System.out.printf("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n", n, t_n, deltat); + System.out.printf("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n", n, t_n, delta_t); if (n >= lastDump + outputPeriod) dumpVariables(n); @@ -358,7 +358,7 @@ protected void executeTimeLoopN() u_n = u_nplus1; } while (continueLoop); - System.out.printf("FINAL TIME: %5.5f - deltat: %5.5f\n", t_n, deltat); + System.out.printf("FINAL TIME: %5.5f - delta_t: %5.5f\n", t_n, delta_t); dumpVariables(n+1); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/iterativeheatequation/IterativeHeatEquation.java b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/iterativeheatequation/IterativeHeatEquation.java index 492ea6a7d..312cedd9d 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/iterativeheatequation/IterativeHeatEquation.java +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-java/iterativeheatequation/IterativeHeatEquation.java @@ -32,7 +32,7 @@ public final class IterativeHeatEquation static final double[] vectOne = new double[] {1.0, 1.0}; static final int maxIterationsK = 1000; static final double epsilon = 1.0E-8; - double deltat; + double delta_t; double t_n; double t_nplus1; double t_n0; @@ -81,7 +81,7 @@ public void jsonInit(final String jsonContent) final JsonElement valueof_maxIterations = options.get("maxIterations"); assert(valueof_maxIterations.isJsonPrimitive()); maxIterations = valueof_maxIterations.getAsJsonPrimitive().getAsInt(); - deltat = 0.001; + delta_t = 0.001; X = new double[nbNodes][2]; Xc = new double[nbCells][2]; u_n = new double[nbCells]; @@ -132,12 +132,12 @@ protected void computeFaceLength() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ protected void computeTn() { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -256,7 +256,7 @@ protected void updateU() /** * Job computeDeltaTn called @2.0 in simulate method. * In variables: D, V - * Out variables: deltat + * Out variables: delta_t */ protected void computeDeltaTn() { @@ -270,7 +270,7 @@ protected void computeDeltaTn() }, (r1, r2) -> minR0(r1, r2) ); - deltat = reduction0 * 0.1; + delta_t = reduction0 * 0.1; } /** @@ -384,7 +384,7 @@ protected void setUpTimeLoopN() /** * Job computeAlphaCoeff called @3.0 in simulate method. - * In variables: V, Xc, deltat, faceConductivity, faceLength + * In variables: V, Xc, delta_t, faceConductivity, faceLength * Out variables: alpha */ protected void computeAlphaCoeff() @@ -392,7 +392,7 @@ protected void computeAlphaCoeff() IntStream.range(0, nbCells).parallel().forEach(cCells -> { final int cId = cCells; - double alphaDiag = 0.0; + double alpha_Diag = 0.0; { final int[] neighbourCellsC = mesh.getNeighbourCells(cId); final int nbNeighbourCellsC = neighbourCellsC.length; @@ -402,12 +402,12 @@ protected void computeAlphaCoeff() final int dCells = dId; final int fId = mesh.getCommonFace(cId, dId); final int fFaces = fId; - final double alphaExtraDiag = deltat / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / norm(operatorSub(Xc[cCells], Xc[dCells])); - alpha[cCells][dCells] = alphaExtraDiag; - alphaDiag = alphaDiag + alphaExtraDiag; + final double alpha_ExtraDiag = delta_t / V[cCells] * (faceLength[fFaces] * faceConductivity[fFaces]) / norm(operatorSub(Xc[cCells], Xc[dCells])); + alpha[cCells][dCells] = alpha_ExtraDiag; + alpha_Diag = alpha_Diag + alpha_ExtraDiag; } } - alpha[cCells][cCells] = -alphaDiag; + alpha[cCells][cCells] = -alpha_Diag; }); } @@ -436,7 +436,7 @@ protected void executeTimeLoopN() do { n++; - System.out.printf("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n", n, t_n, deltat); + System.out.printf("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n", n, t_n, delta_t); if (n >= lastDump + outputPeriod) dumpVariables(n); @@ -455,7 +455,7 @@ protected void executeTimeLoopN() }); } while (continueLoop); - System.out.printf("FINAL TIME: %5.5f - deltat: %5.5f\n", t_n, deltat); + System.out.printf("FINAL TIME: %5.5f - delta_t: %5.5f\n", t_n, delta_t); dumpVariables(n+1); } diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/explicitheatequation/explicitheatequation.py b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/explicitheatequation/explicitheatequation.py index 20c195819..d6f3fd6d3 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/explicitheatequation/explicitheatequation.py +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/explicitheatequation/explicitheatequation.py @@ -26,7 +26,7 @@ def jsonInit(self, jsonContent): self.n = 0 self.stopTime = jsonContent["stopTime"] self.maxIterations = jsonContent["maxIterations"] - self.deltat = 0.001 + self.delta_t = 0.001 self.X = np.empty((self.__nbNodes, 2), dtype=np.double) self.Xc = np.empty((self.__nbCells, 2), dtype=np.double) self.u_n = np.empty((self.__nbCells), dtype=np.double) @@ -63,11 +63,11 @@ def _computeFaceLength(self): """ Job computeTn called @1.0 in executeTimeLoopN method. - In variables: deltat, t_n + In variables: delta_t, t_n Out variables: t_nplus1 """ def _computeTn(self): - self.t_nplus1 = self.t_n + self.deltat + self.t_nplus1 = self.t_n + self.delta_t """ Job computeV called @1.0 in simulate method. @@ -142,13 +142,13 @@ def _updateU(self): """ Job computeDeltaTn called @2.0 in simulate method. In variables: D, V - Out variables: deltat + Out variables: delta_t """ def _computeDeltaTn(self): reduction0 = sys.float_info.max for cCells in range(self.__nbCells): reduction0 = self.__minR0(reduction0, self.V[cCells] / self.D[cCells]) - self.deltat = reduction0 * 0.24 + self.delta_t = reduction0 * 0.24 """ Job computeFaceConductivity called @2.0 in simulate method. @@ -196,13 +196,13 @@ def _setUpTimeLoopN(self): """ Job computeAlphaCoeff called @3.0 in simulate method. - In variables: V, Xc, deltat, faceConductivity, faceLength + In variables: V, Xc, delta_t, faceConductivity, faceLength Out variables: alpha """ def _computeAlphaCoeff(self): for cCells in range(self.__nbCells): cId = cCells - alphaDiag = 0.0 + alpha_Diag = 0.0 neighbourCellsC = mesh.getNeighbourCells(cId) nbNeighbourCellsC = len(neighbourCellsC) for dNeighbourCellsC in range(nbNeighbourCellsC): @@ -210,10 +210,10 @@ def _computeAlphaCoeff(self): dCells = dId fId = mesh.getCommonFace(cId, dId) fFaces = fId - alphaExtraDiag = self.deltat / self.V[cCells] * (self.faceLength[fFaces] * self.faceConductivity[fFaces]) / self.__norm(self.__operatorSub(self.Xc[cCells], self.Xc[dCells])) - self.alpha[cCells, dCells] = alphaExtraDiag - alphaDiag = alphaDiag + alphaExtraDiag - self.alpha[cCells, cCells] = 1 - alphaDiag + alpha_ExtraDiag = self.delta_t / self.V[cCells] * (self.faceLength[fFaces] * self.faceConductivity[fFaces]) / self.__norm(self.__operatorSub(self.Xc[cCells], self.Xc[dCells])) + self.alpha[cCells, dCells] = alpha_ExtraDiag + alpha_Diag = alpha_Diag + alpha_ExtraDiag + self.alpha[cCells, cCells] = 1 - alpha_Diag """ Job executeTimeLoopN called @4.0 in simulate method. @@ -226,7 +226,7 @@ def _executeTimeLoopN(self): continueLoop = True while continueLoop: self.n += 1 - print("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n" % (self.n, self.t_n, self.deltat)) + print("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n" % (self.n, self.t_n, self.delta_t)) if (self.n >= self.lastDump + self.outputPeriod): self.__dumpVariables(self.n) @@ -240,7 +240,7 @@ def _executeTimeLoopN(self): for i1Cells in range(self.__nbCells): self.u_n[i1Cells] = self.u_nplus1[i1Cells] - print("FINAL TIME: %5.5f - deltat: %5.5f\n" % (self.t_n, self.deltat)) + print("FINAL TIME: %5.5f - delta_t: %5.5f\n" % (self.t_n, self.delta_t)) self.__dumpVariables(self.n+1); def __norm(self, a): diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/glace2d/glace2d.py b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/glace2d/glace2d.py index d33f2533b..83b123e28 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/glace2d/glace2d.py +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/glace2d/glace2d.py @@ -11,9 +11,9 @@ class Glace2d: gamma = 1.4 xInterface = 0.5 - deltatCfl = 0.4 - rhoIniZg = 1.0 - rhoIniZd = 0.125 + delta_tCfl = 0.4 + rho_IniZg = 1.0 + rho_IniZd = 0.125 pIniZg = 1.0 pIniZd = 0.1 @@ -51,7 +51,7 @@ def jsonInit(self, jsonContent): self.E_n = np.empty((self.__nbCells), dtype=np.double) self.E_nplus1 = np.empty((self.__nbCells), dtype=np.double) self.V = np.empty((self.__nbCells), dtype=np.double) - self.deltatj = np.empty((self.__nbCells), dtype=np.double) + self.delta_tj = np.empty((self.__nbCells), dtype=np.double) self.uj_n = np.empty((self.__nbCells, 2), dtype=np.double) self.uj_nplus1 = np.empty((self.__nbCells, 2), dtype=np.double) self.l = np.empty((self.__nbCells, 4), dtype=np.double) @@ -148,7 +148,7 @@ def _computeV(self): """ Job initialize called @2.0 in simulate method. - In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rhoIniZd, rhoIniZg, xInterface + In variables: Cjr_ic, X_n0, gamma, pIniZd, pIniZg, rho_IniZd, rho_IniZg, xInterface Out variables: E_n, m, p, rho, uj_n """ def _initialize(self): @@ -163,10 +163,10 @@ def _initialize(self): reduction0 = self.__sumR1(reduction0, self.X_n0[rNodes]) center = self.__operatorMult(0.25, reduction0) if center[0] < self.xInterface: - rho_ic = self.rhoIniZg + rho_ic = self.rho_IniZg p_ic = self.pIniZg else: - rho_ic = self.rhoIniZd + rho_ic = self.rho_IniZd p_ic = self.pIniZd reduction1 = 0.0 nodesOfCellJ = mesh.getNodesOfCell(jId) @@ -210,11 +210,11 @@ def _computeDensity(self): def _executeTimeLoopN(self): self.n = 0 self.t_n = 0.0 - self.deltat = 0.0 + self.delta_t = 0.0 continueLoop = True while continueLoop: self.n += 1 - print("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n" % (self.n, self.t_n, self.deltat)) + print("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n" % (self.n, self.t_n, self.delta_t)) if (self.n >= self.lastDump + self.outputPeriod): self.__dumpVariables(self.n) @@ -253,7 +253,7 @@ def _executeTimeLoopN(self): for i1 in range(2): self.uj_n[i1Cells, i1] = self.uj_nplus1[i1Cells, i1] - print("FINAL TIME: %5.5f - deltat: %5.5f\n" % (self.t_n, self.deltat)) + print("FINAL TIME: %5.5f - delta_t: %5.5f\n" % (self.t_n, self.delta_t)) self.__dumpVariables(self.n+1); """ @@ -290,7 +290,7 @@ def _computeAjr(self): """ Job computedeltatj called @6.0 in executeTimeLoopN method. In variables: V, c, l - Out variables: deltatj + Out variables: delta_tj """ def _computedeltatj(self): for jCells in range(self.__nbCells): @@ -300,7 +300,7 @@ def _computedeltatj(self): nbNodesOfCellJ = len(nodesOfCellJ) for rNodesOfCellJ in range(nbNodesOfCellJ): reduction0 = self.__sumR0(reduction0, self.l[jCells, rNodesOfCellJ]) - self.deltatj[jCells] = 2.0 * self.V[jCells] / (self.c[jCells] * reduction0) + self.delta_tj[jCells] = 2.0 * self.V[jCells] / (self.c[jCells] * reduction0) """ Job computeAr called @7.0 in executeTimeLoopN method. @@ -343,14 +343,14 @@ def _computeBr(self): """ Job computeDt called @7.0 in executeTimeLoopN method. - In variables: deltatCfl, deltatj, stopTime, t_n - Out variables: deltat + In variables: delta_tCfl, delta_tj, stopTime, t_n + Out variables: delta_t """ def _computeDt(self): reduction0 = sys.float_info.max for jCells in range(self.__nbCells): - reduction0 = self.__minR0(reduction0, self.deltatj[jCells]) - self.deltat = min((self.deltatCfl * reduction0), (self.stopTime - self.t_n)) + reduction0 = self.__minR0(reduction0, self.delta_tj[jCells]) + self.delta_t = min((self.delta_tCfl * reduction0), (self.stopTime - self.t_n)) """ Job computeBoundaryConditions called @8.0 in executeTimeLoopN method. @@ -423,11 +423,11 @@ def _computeMt(self): """ Job computeTn called @8.0 in executeTimeLoopN method. - In variables: deltat, t_n + In variables: delta_t, t_n Out variables: t_nplus1 """ def _computeTn(self): - self.t_nplus1 = self.t_n + self.deltat + self.t_nplus1 = self.t_n + self.delta_t """ Job computeU called @9.0 in executeTimeLoopN method. @@ -455,16 +455,16 @@ def _computeFjr(self): """ Job computeXn called @10.0 in executeTimeLoopN method. - In variables: X_n, deltat, ur + In variables: X_n, delta_t, ur Out variables: X_nplus1 """ def _computeXn(self): for rNodes in range(self.__nbNodes): - self.X_nplus1[rNodes] = self.__operatorAdd(self.X_n[rNodes], self.__operatorMult(self.deltat, self.ur[rNodes])) + self.X_nplus1[rNodes] = self.__operatorAdd(self.X_n[rNodes], self.__operatorMult(self.delta_t, self.ur[rNodes])) """ Job computeEn called @11.0 in executeTimeLoopN method. - In variables: E_n, F, deltat, m, ur + In variables: E_n, F, delta_t, m, ur Out variables: E_nplus1 """ def _computeEn(self): @@ -477,11 +477,11 @@ def _computeEn(self): rId = nodesOfCellJ[rNodesOfCellJ] rNodes = rId reduction0 = self.__sumR0(reduction0, self.__dot(self.F[jCells, rNodesOfCellJ], self.ur[rNodes])) - self.E_nplus1[jCells] = self.E_n[jCells] - (self.deltat / self.m[jCells]) * reduction0 + self.E_nplus1[jCells] = self.E_n[jCells] - (self.delta_t / self.m[jCells]) * reduction0 """ Job computeUn called @11.0 in executeTimeLoopN method. - In variables: F, deltat, m, uj_n + In variables: F, delta_t, m, uj_n Out variables: uj_nplus1 """ def _computeUn(self): @@ -492,7 +492,7 @@ def _computeUn(self): nbNodesOfCellJ = len(nodesOfCellJ) for rNodesOfCellJ in range(nbNodesOfCellJ): reduction0 = self.__sumR1(reduction0, self.F[jCells, rNodesOfCellJ]) - self.uj_nplus1[jCells] = self.__operatorSub(self.uj_n[jCells], self.__operatorMult((self.deltat / self.m[jCells]), reduction0)) + self.uj_nplus1[jCells] = self.__operatorSub(self.uj_n[jCells], self.__operatorMult((self.delta_t / self.m[jCells]), reduction0)) def __det1(self, a): return a[0, 0] * a[1, 1] - a[0, 1] * a[1, 0] diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/heatequation/heatequation.py b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/heatequation/heatequation.py index 316871bc1..531980abf 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/heatequation/heatequation.py +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/heatequation/heatequation.py @@ -11,7 +11,7 @@ class HeatEquation: PI = 3.1415926 alpha = 1.0 - deltat = 0.001 + delta_t = 0.001 def __init__(self, mesh): self.__mesh = mesh @@ -43,7 +43,7 @@ def jsonInit(self, jsonContent): """ Job computeOutgoingFlux called @1.0 in executeTimeLoopN method. - In variables: V, center, deltat, surface, u_n + In variables: V, center, delta_t, surface, u_n Out variables: outgoingFlux """ def _computeOutgoingFlux(self): @@ -59,7 +59,7 @@ def _computeOutgoingFlux(self): cfFaces = cfId reduction1 = (self.u_n[j2Cells] - self.u_n[j1Cells]) / self.__norm(self.__operatorSub(self.center[j2Cells], self.center[j1Cells])) * self.surface[cfFaces] reduction0 = self.__sumR0(reduction0, reduction1) - self.outgoingFlux[j1Cells] = self.deltat / self.V[j1Cells] * reduction0 + self.outgoingFlux[j1Cells] = self.delta_t / self.V[j1Cells] * reduction0 """ Job computeSurface called @1.0 in simulate method. @@ -82,11 +82,11 @@ def _computeSurface(self): """ Job computeTn called @1.0 in executeTimeLoopN method. - In variables: deltat, t_n + In variables: delta_t, t_n Out variables: t_nplus1 """ def _computeTn(self): - self.t_nplus1 = self.t_n + self.deltat + self.t_nplus1 = self.t_n + self.delta_t """ Job computeV called @1.0 in simulate method. @@ -143,12 +143,12 @@ def _iniTime(self): """ Job computeUn called @2.0 in executeTimeLoopN method. - In variables: deltat, f, outgoingFlux, u_n + In variables: delta_t, f, outgoingFlux, u_n Out variables: u_nplus1 """ def _computeUn(self): for jCells in range(self.__nbCells): - self.u_nplus1[jCells] = self.f[jCells] * self.deltat + self.u_n[jCells] + self.outgoingFlux[jCells] + self.u_nplus1[jCells] = self.f[jCells] * self.delta_t + self.u_n[jCells] + self.outgoingFlux[jCells] """ Job iniUn called @2.0 in simulate method. @@ -178,7 +178,7 @@ def _executeTimeLoopN(self): continueLoop = True while continueLoop: self.n += 1 - print("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n" % (self.n, self.t_n, self.deltat)) + print("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n" % (self.n, self.t_n, self.delta_t)) if (self.n >= self.lastDump + self.outputPeriod): self.__dumpVariables(self.n) @@ -193,7 +193,7 @@ def _executeTimeLoopN(self): for i1Cells in range(self.__nbCells): self.u_n[i1Cells] = self.u_nplus1[i1Cells] - print("FINAL TIME: %5.5f - deltat: %5.5f\n" % (self.t_n, self.deltat)) + print("FINAL TIME: %5.5f - delta_t: %5.5f\n" % (self.t_n, self.delta_t)) self.__dumpVariables(self.n+1); def __det(self, a, b): diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/implicitheatequation/implicitheatequation.py b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/implicitheatequation/implicitheatequation.py index 32739f516..fb2d007f0 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/implicitheatequation/implicitheatequation.py +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/implicitheatequation/implicitheatequation.py @@ -29,7 +29,7 @@ def jsonInit(self, jsonContent): self.n = 0 self.stopTime = jsonContent["stopTime"] self.maxIterations = jsonContent["maxIterations"] - self.deltat = 0.001 + self.delta_t = 0.001 self.X = np.empty((self.__nbNodes, 2), dtype=np.double) self.Xc = np.empty((self.__nbCells, 2), dtype=np.double) self.u_n = Vector.zeros("u_n", self.__nbCells) @@ -70,11 +70,11 @@ def _computeFaceLength(self): """ Job computeTn called @1.0 in executeTimeLoopN method. - In variables: deltat, t_n + In variables: delta_t, t_n Out variables: t_nplus1 """ def _computeTn(self): - self.t_nplus1 = self.t_n + self.deltat + self.t_nplus1 = self.t_n + self.delta_t """ Job computeV called @1.0 in simulate method. @@ -140,13 +140,13 @@ def _updateU(self): """ Job computeDeltaTn called @2.0 in simulate method. In variables: D, V - Out variables: deltat + Out variables: delta_t """ def _computeDeltaTn(self): reduction0 = sys.float_info.max for cCells in range(self.__nbCells): reduction0 = self.__minR0(reduction0, self.V[cCells] / self.D[cCells]) - self.deltat = reduction0 * 0.24 + self.delta_t = reduction0 * 0.24 """ Job computeFaceConductivity called @2.0 in simulate method. @@ -194,13 +194,13 @@ def _setUpTimeLoopN(self): """ Job computeAlphaCoeff called @3.0 in simulate method. - In variables: V, Xc, deltat, faceConductivity, faceLength + In variables: V, Xc, delta_t, faceConductivity, faceLength Out variables: alpha """ def _computeAlphaCoeff(self): for cCells in range(self.__nbCells): cId = cCells - alphaDiag = 0.0 + alpha_Diag = 0.0 neighbourCellsC = mesh.getNeighbourCells(cId) nbNeighbourCellsC = len(neighbourCellsC) for dNeighbourCellsC in range(nbNeighbourCellsC): @@ -208,10 +208,10 @@ def _computeAlphaCoeff(self): dCells = dId fId = mesh.getCommonFace(cId, dId) fFaces = fId - alphaExtraDiag = -self.deltat / self.V[cCells] * (self.faceLength[fFaces] * self.faceConductivity[fFaces]) / self.__norm(self.__operatorSub(self.Xc[cCells], self.Xc[dCells])) - self.alpha.setValue(cCells, dCells, alphaExtraDiag) - alphaDiag = alphaDiag + alphaExtraDiag - self.alpha.setValue(cCells, cCells, 1 - alphaDiag) + alpha_ExtraDiag = -self.delta_t / self.V[cCells] * (self.faceLength[fFaces] * self.faceConductivity[fFaces]) / self.__norm(self.__operatorSub(self.Xc[cCells], self.Xc[dCells])) + self.alpha.setValue(cCells, dCells, alpha_ExtraDiag) + alpha_Diag = alpha_Diag + alpha_ExtraDiag + self.alpha.setValue(cCells, cCells, 1 - alpha_Diag) """ Job executeTimeLoopN called @4.0 in simulate method. @@ -224,7 +224,7 @@ def _executeTimeLoopN(self): continueLoop = True while continueLoop: self.n += 1 - print("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n" % (self.n, self.t_n, self.deltat)) + print("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n" % (self.n, self.t_n, self.delta_t)) if (self.n >= self.lastDump + self.outputPeriod): self.__dumpVariables(self.n) @@ -237,7 +237,7 @@ def _executeTimeLoopN(self): self.t_n = self.t_nplus1 self.u_n = self.u_nplus1 - print("FINAL TIME: %5.5f - deltat: %5.5f\n" % (self.t_n, self.deltat)) + print("FINAL TIME: %5.5f - delta_t: %5.5f\n" % (self.t_n, self.delta_t)) self.__dumpVariables(self.n+1); def __norm(self, a): diff --git a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/iterativeheatequation/iterativeheatequation.py b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/iterativeheatequation/iterativeheatequation.py index 98be88037..5c4afd1c0 100644 --- a/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/iterativeheatequation/iterativeheatequation.py +++ b/plugins/fr.cea.nabla.ui/examples/NabLabExamples/src-gen-python/iterativeheatequation/iterativeheatequation.py @@ -29,7 +29,7 @@ def jsonInit(self, jsonContent): self.k = 0 self.stopTime = jsonContent["stopTime"] self.maxIterations = jsonContent["maxIterations"] - self.deltat = 0.001 + self.delta_t = 0.001 self.X = np.empty((self.__nbNodes, 2), dtype=np.double) self.Xc = np.empty((self.__nbCells, 2), dtype=np.double) self.u_n = np.empty((self.__nbCells), dtype=np.double) @@ -68,11 +68,11 @@ def _computeFaceLength(self): """ Job computeTn called @1.0 in executeTimeLoopN method. - In variables: deltat, t_n + In variables: delta_t, t_n Out variables: t_nplus1 """ def _computeTn(self): - self.t_nplus1 = self.t_n + self.deltat + self.t_nplus1 = self.t_n + self.delta_t """ Job computeV called @1.0 in simulate method. @@ -156,13 +156,13 @@ def _updateU(self): """ Job computeDeltaTn called @2.0 in simulate method. In variables: D, V - Out variables: deltat + Out variables: delta_t """ def _computeDeltaTn(self): reduction0 = sys.float_info.max for cCells in range(self.__nbCells): reduction0 = self.__minR0(reduction0, self.V[cCells] / self.D[cCells]) - self.deltat = reduction0 * 0.1 + self.delta_t = reduction0 * 0.1 """ Job computeFaceConductivity called @2.0 in simulate method. @@ -243,13 +243,13 @@ def _setUpTimeLoopN(self): """ Job computeAlphaCoeff called @3.0 in simulate method. - In variables: V, Xc, deltat, faceConductivity, faceLength + In variables: V, Xc, delta_t, faceConductivity, faceLength Out variables: alpha """ def _computeAlphaCoeff(self): for cCells in range(self.__nbCells): cId = cCells - alphaDiag = 0.0 + alpha_Diag = 0.0 neighbourCellsC = mesh.getNeighbourCells(cId) nbNeighbourCellsC = len(neighbourCellsC) for dNeighbourCellsC in range(nbNeighbourCellsC): @@ -257,10 +257,10 @@ def _computeAlphaCoeff(self): dCells = dId fId = mesh.getCommonFace(cId, dId) fFaces = fId - alphaExtraDiag = self.deltat / self.V[cCells] * (self.faceLength[fFaces] * self.faceConductivity[fFaces]) / self.__norm(self.__operatorSub(self.Xc[cCells], self.Xc[dCells])) - self.alpha[cCells, dCells] = alphaExtraDiag - alphaDiag = alphaDiag + alphaExtraDiag - self.alpha[cCells, cCells] = -alphaDiag + alpha_ExtraDiag = self.delta_t / self.V[cCells] * (self.faceLength[fFaces] * self.faceConductivity[fFaces]) / self.__norm(self.__operatorSub(self.Xc[cCells], self.Xc[dCells])) + self.alpha[cCells, dCells] = alpha_ExtraDiag + alpha_Diag = alpha_Diag + alpha_ExtraDiag + self.alpha[cCells, cCells] = -alpha_Diag """ Job tearDownTimeLoopK called @3.0 in executeTimeLoopN method. @@ -282,7 +282,7 @@ def _executeTimeLoopN(self): continueLoop = True while continueLoop: self.n += 1 - print("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n" % (self.n, self.t_n, self.deltat)) + print("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n" % (self.n, self.t_n, self.delta_t)) if (self.n >= self.lastDump + self.outputPeriod): self.__dumpVariables(self.n) @@ -298,7 +298,7 @@ def _executeTimeLoopN(self): for i1Cells in range(self.__nbCells): self.u_n[i1Cells] = self.u_nplus1[i1Cells] - print("FINAL TIME: %5.5f - deltat: %5.5f\n" % (self.t_n, self.deltat)) + print("FINAL TIME: %5.5f - delta_t: %5.5f\n" % (self.t_n, self.delta_t)) self.__dumpVariables(self.n+1); def __check(self, a): diff --git a/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/Hydro.axl b/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/Hydro.axl index 2b4472f73..3d2b0291d 100644 --- a/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/Hydro.axl +++ b/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/Hydro.axl @@ -84,7 +84,7 @@ - + diff --git a/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/HydroModule.cc b/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/HydroModule.cc index add0c9146..bc48534c6 100644 --- a/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/HydroModule.cc +++ b/tests/NabLabTests/src-gen-arcane/accelerator/hydroremap/HydroModule.cc @@ -34,7 +34,7 @@ void HydroModule::init() // initialization of other attributes // constant time step - m_global_deltat = options()->deltat(); + m_global_deltat = options()->deltaT(); // calling jobs iniHv1(); // @1.0 diff --git a/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.cc b/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.cc index 5018a1146..d9197e25d 100644 --- a/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.cc +++ b/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.cc @@ -37,7 +37,7 @@ void IterationModule::init() m_l = 0; // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs iniTime(); // @1.0 @@ -48,12 +48,12 @@ void IterationModule::init() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** diff --git a/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.h b/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.h index 45ad409ae..b0ff40abf 100644 --- a/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.h +++ b/tests/NabLabTests/src-gen-arcane/accelerator/iteration/IterationModule.h @@ -68,7 +68,7 @@ class IterationModule Int32 m_k; Int32 m_l; static constexpr Real m_maxTime = 0.1; - static constexpr Real m_deltat = 1.0; + static constexpr Real m_delta_t = 1.0; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.cc b/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.cc index b2186eee0..28ce6fd20 100644 --- a/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.cc +++ b/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.cc @@ -65,7 +65,7 @@ void VariablesModule::init() m_dynamicVec.resize(options()->optDim()); // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs dynamicVecInitialization(); // @1.0 diff --git a/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.h b/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.h index 274eb51d6..6fe538462 100644 --- a/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.h +++ b/tests/NabLabTests/src-gen-arcane/accelerator/variables/VariablesModule.h @@ -53,7 +53,7 @@ class VariablesModule // other attributes static constexpr Real m_maxTime = 0.1; static constexpr Int32 m_maxIter = 500; - static constexpr Real m_deltat = 1.0; + static constexpr Real m_delta_t = 1.0; static constexpr Real m_t = 0.0; Real2 m_optVect3; static constexpr Int32 m_constexprDim = 2; diff --git a/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/Hydro.axl b/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/Hydro.axl index 2b4472f73..3d2b0291d 100644 --- a/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/Hydro.axl +++ b/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/Hydro.axl @@ -84,7 +84,7 @@ - + diff --git a/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/HydroModule.cc b/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/HydroModule.cc index 8894254d9..6dcd9b5be 100644 --- a/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/HydroModule.cc +++ b/tests/NabLabTests/src-gen-arcane/sequential/hydroremap/HydroModule.cc @@ -33,7 +33,7 @@ void HydroModule::init() // initialization of other attributes // constant time step - m_global_deltat = options()->deltat(); + m_global_deltat = options()->deltaT(); // calling jobs iniHv1(); // @1.0 diff --git a/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.cc b/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.cc index 39f2409fc..8c2c51683 100644 --- a/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.cc +++ b/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.cc @@ -36,7 +36,7 @@ void IterationModule::init() m_l = 0; // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs iniTime(); // @1.0 @@ -47,12 +47,12 @@ void IterationModule::init() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** diff --git a/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.h b/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.h index a35af34c5..0722ceca5 100644 --- a/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.h +++ b/tests/NabLabTests/src-gen-arcane/sequential/iteration/IterationModule.h @@ -63,7 +63,7 @@ class IterationModule Int32 m_k; Int32 m_l; static constexpr Real m_maxTime = 0.1; - static constexpr Real m_deltat = 1.0; + static constexpr Real m_delta_t = 1.0; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.cc b/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.cc index 7854cac19..d58572bc5 100644 --- a/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.cc +++ b/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.cc @@ -64,7 +64,7 @@ void VariablesModule::init() m_dynamicVec.resize(options()->optDim()); // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs dynamicVecInitialization(); // @1.0 diff --git a/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.h b/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.h index 30045aa76..acdbd1d62 100644 --- a/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.h +++ b/tests/NabLabTests/src-gen-arcane/sequential/variables/VariablesModule.h @@ -48,7 +48,7 @@ class VariablesModule // other attributes static constexpr Real m_maxTime = 0.1; static constexpr Int32 m_maxIter = 500; - static constexpr Real m_deltat = 1.0; + static constexpr Real m_delta_t = 1.0; static constexpr Real m_t = 0.0; Real2 m_optVect3; static constexpr Int32 m_constexprDim = 2; diff --git a/tests/NabLabTests/src-gen-arcane/thread/hydroremap/Hydro.axl b/tests/NabLabTests/src-gen-arcane/thread/hydroremap/Hydro.axl index 2b4472f73..3d2b0291d 100644 --- a/tests/NabLabTests/src-gen-arcane/thread/hydroremap/Hydro.axl +++ b/tests/NabLabTests/src-gen-arcane/thread/hydroremap/Hydro.axl @@ -84,7 +84,7 @@ - + diff --git a/tests/NabLabTests/src-gen-arcane/thread/hydroremap/HydroModule.cc b/tests/NabLabTests/src-gen-arcane/thread/hydroremap/HydroModule.cc index 866a3db3b..cfaa97d38 100644 --- a/tests/NabLabTests/src-gen-arcane/thread/hydroremap/HydroModule.cc +++ b/tests/NabLabTests/src-gen-arcane/thread/hydroremap/HydroModule.cc @@ -33,7 +33,7 @@ void HydroModule::init() // initialization of other attributes // constant time step - m_global_deltat = options()->deltat(); + m_global_deltat = options()->deltaT(); // calling jobs iniHv1(); // @1.0 diff --git a/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.cc b/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.cc index 632abd2cf..6639f558a 100644 --- a/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.cc +++ b/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.cc @@ -36,7 +36,7 @@ void IterationModule::init() m_l = 0; // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs iniTime(); // @1.0 @@ -47,12 +47,12 @@ void IterationModule::init() /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void IterationModule::computeTn() { - m_t_nplus1 = m_t_n + m_deltat; + m_t_nplus1 = m_t_n + m_delta_t; } /** diff --git a/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.h b/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.h index a35af34c5..0722ceca5 100644 --- a/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.h +++ b/tests/NabLabTests/src-gen-arcane/thread/iteration/IterationModule.h @@ -63,7 +63,7 @@ class IterationModule Int32 m_k; Int32 m_l; static constexpr Real m_maxTime = 0.1; - static constexpr Real m_deltat = 1.0; + static constexpr Real m_delta_t = 1.0; Real m_t_n; Real m_t_nplus1; Real m_t_n0; diff --git a/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.cc b/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.cc index 7854cac19..d58572bc5 100644 --- a/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.cc +++ b/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.cc @@ -64,7 +64,7 @@ void VariablesModule::init() m_dynamicVec.resize(options()->optDim()); // constant time step - m_global_deltat = m_deltat; + m_global_deltat = m_delta_t; // calling jobs dynamicVecInitialization(); // @1.0 diff --git a/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.h b/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.h index 30045aa76..acdbd1d62 100644 --- a/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.h +++ b/tests/NabLabTests/src-gen-arcane/thread/variables/VariablesModule.h @@ -48,7 +48,7 @@ class VariablesModule // other attributes static constexpr Real m_maxTime = 0.1; static constexpr Int32 m_maxIter = 500; - static constexpr Real m_deltat = 1.0; + static constexpr Real m_delta_t = 1.0; static constexpr Real m_t = 0.0; Real2 m_optVect3; static constexpr Int32 m_constexprDim = 2; diff --git a/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.cc b/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.cc index 10f0eaaa1..465b67ab8 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.cc +++ b/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.cc @@ -61,10 +61,10 @@ Hydro::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxTime = options["maxTime"]; assert(valueof_maxTime.IsDouble()); maxTime = valueof_maxTime.GetDouble(); - assert(options.HasMember("deltat")); - const rapidjson::Value& valueof_deltat = options["deltat"]; - assert(valueof_deltat.IsDouble()); - deltat = valueof_deltat.GetDouble(); + assert(options.HasMember("delta_t")); + const rapidjson::Value& valueof_delta_t = options["delta_t"]; + assert(valueof_delta_t.IsDouble()); + delta_t = valueof_delta_t.GetDouble(); // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); diff --git a/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.h b/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.h index 41f5e4b1e..4b929855a 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.h +++ b/tests/NabLabTests/src-gen-cpp/kokkos-team/hydroremap/Hydro.h @@ -91,7 +91,7 @@ class Hydro // Module variables are public members of the class to be accessible from Python. int maxIter; double maxTime; - double deltat; + double delta_t; static constexpr double t = 0.0; Kokkos::View*> X; Kokkos::View hv1; diff --git a/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.cc b/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.cc index 187b6bb89..5fe7bc254 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.cc +++ b/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.cc @@ -95,12 +95,12 @@ const std::pair Iteration::computeTeamWorkRange(const member_typ /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Iteration::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -368,7 +368,7 @@ void Iteration::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterN, t_n, maxTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterN, t_n, maxTime, deltat, globalTimer), true) + eta(n, maxIterN, t_n, maxTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.h b/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.h index 99cca2fbb..ab1c84edc 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.h +++ b/tests/NabLabTests/src-gen-cpp/kokkos-team/iteration/Iteration.h @@ -90,7 +90,7 @@ class Iteration int k; int l; static constexpr double maxTime = 0.1; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; double t_n; double t_nplus1; double t_n0; diff --git a/tests/NabLabTests/src-gen-cpp/kokkos-team/variables/Variables.h b/tests/NabLabTests/src-gen-cpp/kokkos-team/variables/Variables.h index a293afe50..0ab2a2aba 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos-team/variables/Variables.h +++ b/tests/NabLabTests/src-gen-cpp/kokkos-team/variables/Variables.h @@ -76,7 +76,7 @@ class Variables // Module variables are public members of the class to be accessible from Python. static constexpr double maxTime = 0.1; static constexpr int maxIter = 500; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; static constexpr double t = 0.0; Kokkos::View*> X; int optDim; diff --git a/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.cc b/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.cc index faefdcefa..765808f72 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.cc +++ b/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.cc @@ -61,10 +61,10 @@ Hydro::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxTime = options["maxTime"]; assert(valueof_maxTime.IsDouble()); maxTime = valueof_maxTime.GetDouble(); - assert(options.HasMember("deltat")); - const rapidjson::Value& valueof_deltat = options["deltat"]; - assert(valueof_deltat.IsDouble()); - deltat = valueof_deltat.GetDouble(); + assert(options.HasMember("delta_t")); + const rapidjson::Value& valueof_delta_t = options["delta_t"]; + assert(valueof_delta_t.IsDouble()); + delta_t = valueof_delta_t.GetDouble(); // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); diff --git a/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.h b/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.h index fed7c8205..818272efe 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.h +++ b/tests/NabLabTests/src-gen-cpp/kokkos/hydroremap/Hydro.h @@ -82,7 +82,7 @@ class Hydro // Module variables are public members of the class to be accessible from Python. int maxIter; double maxTime; - double deltat; + double delta_t; static constexpr double t = 0.0; Kokkos::View*> X; Kokkos::View hv1; diff --git a/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.cc b/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.cc index bd477ad88..6f378b24f 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.cc +++ b/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.cc @@ -72,12 +72,12 @@ Iteration::jsonInit(const char* jsonContent) /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Iteration::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -252,7 +252,7 @@ void Iteration::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterN, t_n, maxTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterN, t_n, maxTime, deltat, globalTimer), true) + eta(n, maxIterN, t_n, maxTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.h b/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.h index 3133de29f..27a403aaa 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.h +++ b/tests/NabLabTests/src-gen-cpp/kokkos/iteration/Iteration.h @@ -81,7 +81,7 @@ class Iteration int k; int l; static constexpr double maxTime = 0.1; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; double t_n; double t_nplus1; double t_n0; diff --git a/tests/NabLabTests/src-gen-cpp/kokkos/variables/Variables.h b/tests/NabLabTests/src-gen-cpp/kokkos/variables/Variables.h index 31c6469c2..3606ddefa 100644 --- a/tests/NabLabTests/src-gen-cpp/kokkos/variables/Variables.h +++ b/tests/NabLabTests/src-gen-cpp/kokkos/variables/Variables.h @@ -67,7 +67,7 @@ class Variables // Module variables are public members of the class to be accessible from Python. static constexpr double maxTime = 0.1; static constexpr int maxIter = 500; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; static constexpr double t = 0.0; Kokkos::View*> X; int optDim; diff --git a/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.cc b/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.cc index 5e1b3e41e..3d49892fc 100644 --- a/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.cc +++ b/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.cc @@ -61,10 +61,10 @@ Hydro::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxTime = options["maxTime"]; assert(valueof_maxTime.IsDouble()); maxTime = valueof_maxTime.GetDouble(); - assert(options.HasMember("deltat")); - const rapidjson::Value& valueof_deltat = options["deltat"]; - assert(valueof_deltat.IsDouble()); - deltat = valueof_deltat.GetDouble(); + assert(options.HasMember("delta_t")); + const rapidjson::Value& valueof_delta_t = options["delta_t"]; + assert(valueof_delta_t.IsDouble()); + delta_t = valueof_delta_t.GetDouble(); // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); diff --git a/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.h b/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.h index 39de2215f..5df311d6c 100644 --- a/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.h +++ b/tests/NabLabTests/src-gen-cpp/openmp/hydroremap/Hydro.h @@ -79,7 +79,7 @@ class Hydro // Module variables are public members of the class to be accessible from Python. int maxIter; double maxTime; - double deltat; + double delta_t; static constexpr double t = 0.0; std::vector> X; std::vector hv1; diff --git a/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.cc b/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.cc index 52a4f6861..377f46a18 100644 --- a/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.cc +++ b/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.cc @@ -72,12 +72,12 @@ Iteration::jsonInit(const char* jsonContent) /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Iteration::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -262,7 +262,7 @@ void Iteration::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterN, t_n, maxTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterN, t_n, maxTime, deltat, globalTimer), true) + eta(n, maxIterN, t_n, maxTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.h b/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.h index 590717fcd..11c5734aa 100644 --- a/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.h +++ b/tests/NabLabTests/src-gen-cpp/openmp/iteration/Iteration.h @@ -78,7 +78,7 @@ class Iteration int k; int l; static constexpr double maxTime = 0.1; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; double t_n; double t_nplus1; double t_n0; diff --git a/tests/NabLabTests/src-gen-cpp/openmp/variables/Variables.h b/tests/NabLabTests/src-gen-cpp/openmp/variables/Variables.h index d47dd5940..0f31fd98d 100644 --- a/tests/NabLabTests/src-gen-cpp/openmp/variables/Variables.h +++ b/tests/NabLabTests/src-gen-cpp/openmp/variables/Variables.h @@ -64,7 +64,7 @@ class Variables // Module variables are public members of the class to be accessible from Python. static constexpr double maxTime = 0.1; static constexpr int maxIter = 500; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; static constexpr double t = 0.0; std::vector> X; int optDim; diff --git a/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.cc b/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.cc index c3f448fa3..e295ace8f 100644 --- a/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.cc +++ b/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.cc @@ -61,10 +61,10 @@ Hydro::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxTime = options["maxTime"]; assert(valueof_maxTime.IsDouble()); maxTime = valueof_maxTime.GetDouble(); - assert(options.HasMember("deltat")); - const rapidjson::Value& valueof_deltat = options["deltat"]; - assert(valueof_deltat.IsDouble()); - deltat = valueof_deltat.GetDouble(); + assert(options.HasMember("delta_t")); + const rapidjson::Value& valueof_delta_t = options["delta_t"]; + assert(valueof_delta_t.IsDouble()); + delta_t = valueof_delta_t.GetDouble(); // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); diff --git a/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.h b/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.h index e3648f68c..f4073145c 100644 --- a/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.h +++ b/tests/NabLabTests/src-gen-cpp/sequential/hydroremap/Hydro.h @@ -78,7 +78,7 @@ class Hydro // Module variables are public members of the class to be accessible from Python. int maxIter; double maxTime; - double deltat; + double delta_t; static constexpr double t = 0.0; std::vector> X; std::vector hv1; diff --git a/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.cc b/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.cc index 362eb5d9c..9f3bf7afd 100644 --- a/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.cc +++ b/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.cc @@ -72,12 +72,12 @@ Iteration::jsonInit(const char* jsonContent) /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Iteration::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -252,7 +252,7 @@ void Iteration::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterN, t_n, maxTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterN, t_n, maxTime, deltat, globalTimer), true) + eta(n, maxIterN, t_n, maxTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.h b/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.h index c508fd7b7..a20b301e0 100644 --- a/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.h +++ b/tests/NabLabTests/src-gen-cpp/sequential/iteration/Iteration.h @@ -77,7 +77,7 @@ class Iteration int k; int l; static constexpr double maxTime = 0.1; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; double t_n; double t_nplus1; double t_n0; diff --git a/tests/NabLabTests/src-gen-cpp/sequential/variables/Variables.h b/tests/NabLabTests/src-gen-cpp/sequential/variables/Variables.h index 169e584ab..6628e26a4 100644 --- a/tests/NabLabTests/src-gen-cpp/sequential/variables/Variables.h +++ b/tests/NabLabTests/src-gen-cpp/sequential/variables/Variables.h @@ -63,7 +63,7 @@ class Variables // Module variables are public members of the class to be accessible from Python. static constexpr double maxTime = 0.1; static constexpr int maxIter = 500; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; static constexpr double t = 0.0; std::vector> X; int optDim; diff --git a/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.cc b/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.cc index 11429d0d2..8ef0f18aa 100644 --- a/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.cc +++ b/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.cc @@ -61,10 +61,10 @@ Hydro::jsonInit(const char* jsonContent) const rapidjson::Value& valueof_maxTime = options["maxTime"]; assert(valueof_maxTime.IsDouble()); maxTime = valueof_maxTime.GetDouble(); - assert(options.HasMember("deltat")); - const rapidjson::Value& valueof_deltat = options["deltat"]; - assert(valueof_deltat.IsDouble()); - deltat = valueof_deltat.GetDouble(); + assert(options.HasMember("delta_t")); + const rapidjson::Value& valueof_delta_t = options["delta_t"]; + assert(valueof_delta_t.IsDouble()); + delta_t = valueof_delta_t.GetDouble(); // Copy node coordinates const auto& gNodes = mesh.getGeometry()->getNodes(); diff --git a/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.h b/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.h index 082051f11..3592a9be9 100644 --- a/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.h +++ b/tests/NabLabTests/src-gen-cpp/stl-thread/hydroremap/Hydro.h @@ -80,7 +80,7 @@ class Hydro // Module variables are public members of the class to be accessible from Python. int maxIter; double maxTime; - double deltat; + double delta_t; static constexpr double t = 0.0; std::vector> X; std::vector hv1; diff --git a/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.cc b/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.cc index cb2615dff..19605eeec 100644 --- a/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.cc +++ b/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.cc @@ -72,12 +72,12 @@ Iteration::jsonInit(const char* jsonContent) /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ void Iteration::computeTn() noexcept { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -282,7 +282,7 @@ void Iteration::executeTimeLoopN() noexcept // Progress std::cout << progress_bar(n, maxIterN, t_n, maxTime, 25); std::cout << __BOLD__ << __CYAN__ << Timer::print( - eta(n, maxIterN, t_n, maxTime, deltat, globalTimer), true) + eta(n, maxIterN, t_n, maxTime, delta_t, globalTimer), true) << __RESET__ << "\r"; std::cout.flush(); diff --git a/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.h b/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.h index d006ff3a6..16910e8c0 100644 --- a/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.h +++ b/tests/NabLabTests/src-gen-cpp/stl-thread/iteration/Iteration.h @@ -79,7 +79,7 @@ class Iteration int k; int l; static constexpr double maxTime = 0.1; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; double t_n; double t_nplus1; double t_n0; diff --git a/tests/NabLabTests/src-gen-cpp/stl-thread/variables/Variables.h b/tests/NabLabTests/src-gen-cpp/stl-thread/variables/Variables.h index d2399e63c..4ab704061 100644 --- a/tests/NabLabTests/src-gen-cpp/stl-thread/variables/Variables.h +++ b/tests/NabLabTests/src-gen-cpp/stl-thread/variables/Variables.h @@ -65,7 +65,7 @@ class Variables // Module variables are public members of the class to be accessible from Python. static constexpr double maxTime = 0.1; static constexpr int maxIter = 500; - static constexpr double deltat = 1.0; + static constexpr double delta_t = 1.0; static constexpr double t = 0.0; std::vector> X; int optDim; diff --git a/tests/NabLabTests/src-gen-java/hydroremap/Hydro.java b/tests/NabLabTests/src-gen-java/hydroremap/Hydro.java index 3af49ddd7..d07429eab 100644 --- a/tests/NabLabTests/src-gen-java/hydroremap/Hydro.java +++ b/tests/NabLabTests/src-gen-java/hydroremap/Hydro.java @@ -25,7 +25,7 @@ public final class Hydro // Options and global variables int maxIter; double maxTime; - double deltat; + double delta_t; static final double t = 0.0; double[][] X; double[] hv1; @@ -56,10 +56,10 @@ public void jsonInit(final String jsonContent) final JsonElement valueof_maxTime = options.get("maxTime"); assert(valueof_maxTime.isJsonPrimitive()); maxTime = valueof_maxTime.getAsJsonPrimitive().getAsDouble(); - assert options.has("deltat") : "No deltat option"; - final JsonElement valueof_deltat = options.get("deltat"); - assert(valueof_deltat.isJsonPrimitive()); - deltat = valueof_deltat.getAsJsonPrimitive().getAsDouble(); + assert options.has("delta_t") : "No delta_t option"; + final JsonElement valueof_delta_t = options.get("delta_t"); + assert(valueof_delta_t.isJsonPrimitive()); + delta_t = valueof_delta_t.getAsJsonPrimitive().getAsDouble(); X = new double[nbNodes][2]; hv1 = new double[nbCells]; hv2 = new double[nbCells]; diff --git a/tests/NabLabTests/src-gen-java/iteration/Iteration.java b/tests/NabLabTests/src-gen-java/iteration/Iteration.java index 38eb0f320..1f1481426 100644 --- a/tests/NabLabTests/src-gen-java/iteration/Iteration.java +++ b/tests/NabLabTests/src-gen-java/iteration/Iteration.java @@ -23,7 +23,7 @@ public final class Iteration int k; int l; static final double maxTime = 0.1; - static final double deltat = 1.0; + static final double delta_t = 1.0; double t_n; double t_nplus1; double t_n0; @@ -86,12 +86,12 @@ public void jsonInit(final String jsonContent) /** * Job computeTn called @1.0 in executeTimeLoopN method. - * In variables: deltat, t_n + * In variables: delta_t, t_n * Out variables: t_nplus1 */ protected void computeTn() { - t_nplus1 = t_n + deltat; + t_nplus1 = t_n + delta_t; } /** @@ -221,7 +221,7 @@ protected void executeTimeLoopN() do { n++; - System.out.printf("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n", n, t_n, deltat); + System.out.printf("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n", n, t_n, delta_t); computeTn(); // @1.0 setUpTimeLoopK(); // @1.0 @@ -254,7 +254,7 @@ protected void executeTimeLoopN() }); } while (continueLoop); - System.out.printf("FINAL TIME: %5.5f - deltat: %5.5f\n", t_n, deltat); + System.out.printf("FINAL TIME: %5.5f - delta_t: %5.5f\n", t_n, delta_t); } /** diff --git a/tests/NabLabTests/src-gen-java/variables/Variables.java b/tests/NabLabTests/src-gen-java/variables/Variables.java index 7bc36119d..a6bd352b5 100644 --- a/tests/NabLabTests/src-gen-java/variables/Variables.java +++ b/tests/NabLabTests/src-gen-java/variables/Variables.java @@ -20,7 +20,7 @@ public final class Variables // Options and global variables static final double maxTime = 0.1; static final int maxIter = 500; - static final double deltat = 1.0; + static final double delta_t = 1.0; static final double t = 0.0; double[][] X; int optDim; diff --git a/tests/NabLabTests/src-gen-python/hydroremap/hydro.py b/tests/NabLabTests/src-gen-python/hydroremap/hydro.py index 2d4032ad2..765c51871 100644 --- a/tests/NabLabTests/src-gen-python/hydroremap/hydro.py +++ b/tests/NabLabTests/src-gen-python/hydroremap/hydro.py @@ -19,7 +19,7 @@ def __init__(self, mesh): def jsonInit(self, jsonContent): self.maxIter = jsonContent["maxIter"] self.maxTime = jsonContent["maxTime"] - self.deltat = jsonContent["deltat"] + self.delta_t = jsonContent["delta_t"] self.X = np.empty((self.__nbNodes, 2), dtype=np.double) self.hv1 = np.empty((self.__nbCells), dtype=np.double) self.hv2 = np.empty((self.__nbCells), dtype=np.double) diff --git a/tests/NabLabTests/src-gen-python/iteration/iteration.py b/tests/NabLabTests/src-gen-python/iteration/iteration.py index 06fc8ba98..bba92cec1 100644 --- a/tests/NabLabTests/src-gen-python/iteration/iteration.py +++ b/tests/NabLabTests/src-gen-python/iteration/iteration.py @@ -8,7 +8,7 @@ class Iteration: maxTime = 0.1 - deltat = 1.0 + delta_t = 1.0 maxIterN = 10 maxIterK = 6 maxIterL = 7 @@ -44,11 +44,11 @@ def jsonInit(self, jsonContent): """ Job computeTn called @1.0 in executeTimeLoopN method. - In variables: deltat, t_n + In variables: delta_t, t_n Out variables: t_nplus1 """ def _computeTn(self): - self.t_nplus1 = self.t_n + self.deltat + self.t_nplus1 = self.t_n + self.delta_t """ Job iniTime called @1.0 in simulate method. @@ -145,7 +145,7 @@ def _executeTimeLoopN(self): continueLoop = True while continueLoop: self.n += 1 - print("START ITERATION n: %5d - t: %5.5f - deltat: %5.5f\n" % (self.n, self.t_n, self.deltat)) + print("START ITERATION n: %5d - t: %5.5f - delta_t: %5.5f\n" % (self.n, self.t_n, self.delta_t)) self._computeTn() # @1.0 self._setUpTimeLoopK() # @1.0 @@ -171,7 +171,7 @@ def _executeTimeLoopN(self): for i1Cells in range(self.__nbCells): self.vl_n[i1Cells] = self.vl_nplus1[i1Cells] - print("FINAL TIME: %5.5f - deltat: %5.5f\n" % (self.t_n, self.deltat)) + print("FINAL TIME: %5.5f - delta_t: %5.5f\n" % (self.t_n, self.delta_t)) """ Job tearDownTimeLoopK called @3.0 in executeTimeLoopN method. diff --git a/tests/NabLabTests/src-gen/hydroremap/HydroRemapDefault.json b/tests/NabLabTests/src-gen/hydroremap/HydroRemapDefault.json index fb3b40633..f5568f975 100644 --- a/tests/NabLabTests/src-gen/hydroremap/HydroRemapDefault.json +++ b/tests/NabLabTests/src-gen/hydroremap/HydroRemapDefault.json @@ -4,7 +4,7 @@ { "maxIter":3, "maxTime":3.0, - "deltat":3.0 + "delta_t":3.0 }, "r1": {