Skip to content

Commit 5762d17

Browse files
author
Francesco Rizzi
committed
Merge branch 'develop' into main
2 parents 04c1b8f + af1bd25 commit 5762d17

14 files changed

+21
-30
lines changed

docs/html/md_pages_rom_galerkin_default_explicit.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@ <h1>
152152
<span class="k">const</span> <span class="n">scalar_t</span> <span class="n">dt</span> <span class="o">=</span> <span class="mf">1.</span><span class="p">;</span>
153153
<span class="k">const</span> <span class="kt">int</span> <span class="n">num_steps</span> <span class="o">=</span> <span class="mi">3</span><span class="p">;</span>
154154
<span class="n">Observer</span> <span class="n">obs</span><span class="p">;</span>
155-
<span class="n">pressio</span><span class="o">::</span><span class="n">ode</span><span class="o">::</span><span class="n">advance_n_steps_and_observe</span><span class="p">(</span>
156-
<span class="n">problem</span><span class="p">.</span><span class="n">stepper</span><span class="p">(),</span> <span class="n">romState</span><span class="p">,</span> <span class="mf">0.</span><span class="p">,</span> <span class="n">dt</span><span class="p">,</span> <span class="n">num_steps</span><span class="p">,</span> <span class="n">obs</span><span class="p">);</span>
155+
<span class="n">pressio</span><span class="o">::</span><span class="n">ode</span><span class="o">::</span><span class="n">advance_n_steps_and_observe</span><span class="p">(</span><span class="n">problem</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="mf">0.</span><span class="p">,</span> <span class="n">dt</span><span class="p">,</span> <span class="n">num_steps</span><span class="p">,</span> <span class="n">obs</span><span class="p">);</span>
157156

158157
<span class="n">pressio</span><span class="o">::</span><span class="n">log</span><span class="o">::</span><span class="n">finalize</span><span class="p">();</span>
159158
<span class="p">}</span></pre>

docs/html/md_pages_rom_galerkin_default_explicit_custom_types.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,10 +326,10 @@ <h1>
326326
<span class="k">const</span> <span class="n">scalar_t</span> <span class="n">dt</span> <span class="o">=</span> <span class="mf">1.</span><span class="p">;</span>
327327
<span class="k">const</span> <span class="kt">int</span> <span class="n">num_steps</span> <span class="o">=</span> <span class="mi">3</span><span class="p">;</span>
328328
<span class="n">Observer</span> <span class="n">obs</span><span class="p">;</span>
329-
<span class="n">pressio</span><span class="o">::</span><span class="n">ode</span><span class="o">::</span><span class="n">advance_n_steps_and_observe</span><span class="p">(</span>
330-
<span class="n">problem</span><span class="p">.</span><span class="n">stepper</span><span class="p">(),</span> <span class="n">romState</span><span class="p">,</span> <span class="mf">0.</span><span class="p">,</span> <span class="n">dt</span><span class="p">,</span> <span class="n">num_steps</span><span class="p">,</span> <span class="n">obs</span><span class="p">);</span>
329+
<span class="n">pressio</span><span class="o">::</span><span class="n">ode</span><span class="o">::</span><span class="n">advance_n_steps_and_observe</span><span class="p">(</span><span class="n">problem</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="mf">0.</span><span class="p">,</span> <span class="n">dt</span><span class="p">,</span> <span class="n">num_steps</span><span class="p">,</span> <span class="n">obs</span><span class="p">);</span>
331330

332-
<span class="n">pressio</span><span class="o">::</span><span class="n">log</span><span class="o">::</span><span class="n">finalize</span><span class="p">();</span></pre></section>
331+
<span class="n">pressio</span><span class="o">::</span><span class="n">log</span><span class="o">::</span><span class="n">finalize</span><span class="p">();</span>
332+
<span class="p">}</span></pre></section>
333333
</div>
334334
</div>
335335
</div>

docs/html/md_pages_rom_galerkin_default_implicit.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,16 +157,15 @@ <h1>
157157
<span class="k">auto</span> <span class="n">problem</span> <span class="o">=</span> <span class="n">pressio</span><span class="o">::</span><span class="n">rom</span><span class="o">::</span><span class="n">galerkin</span><span class="o">::</span><span class="n">create_default_implicit_problem</span>
158158
<span class="p">(</span><span class="n">odescheme</span><span class="p">,</span> <span class="n">fomSystem</span><span class="p">,</span> <span class="n">decoder</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="n">fomReferenceState</span><span class="p">);</span>
159159
<span class="k">using</span> <span class="n">problem_t</span> <span class="o">=</span> <span class="k">decltype</span><span class="p">(</span><span class="n">problem</span><span class="p">);</span>
160-
<span class="k">auto</span> <span class="o">&amp;</span> <span class="n">stepperObj</span> <span class="o">=</span> <span class="n">problem</span><span class="p">.</span><span class="n">stepper</span><span class="p">();</span>
161160

162161
<span class="k">using</span> <span class="n">galerkin_jacobian_t</span> <span class="o">=</span> <span class="k">typename</span> <span class="nc">pressio</span><span class="o">::</span><span class="n">Traits</span><span class="o">&lt;</span><span class="n">problem_t</span><span class="o">&gt;::</span><span class="n">galerkin_jacobian_type</span><span class="p">;</span>
163162
<span class="k">using</span> <span class="n">lin_solver_t</span> <span class="o">=</span> <span class="n">pls</span><span class="o">::</span><span class="n">Solver</span><span class="o">&lt;</span><span class="n">pls</span><span class="o">::</span><span class="n">iterative</span><span class="o">::</span><span class="n">LSCG</span><span class="p">,</span> <span class="n">galerkin_jacobian_t</span><span class="o">&gt;</span><span class="p">;</span>
164163
<span class="n">lin_solver_t</span> <span class="n">linearSolverObj</span><span class="p">;</span>
165-
<span class="k">auto</span> <span class="n">nonLinSolver</span> <span class="o">=</span> <span class="n">pnonls</span><span class="o">::</span><span class="n">create_newton_raphson</span><span class="p">(</span><span class="n">stepperObj</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="n">linearSolverObj</span><span class="p">);</span>
164+
<span class="k">auto</span> <span class="n">nonLinSolver</span> <span class="o">=</span> <span class="n">pnonls</span><span class="o">::</span><span class="n">create_newton_raphson</span><span class="p">(</span><span class="n">problem</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="n">linearSolverObj</span><span class="p">);</span>
166165
<span class="n">nonLinSolver</span><span class="p">.</span><span class="n">setMaxIterations</span><span class="p">(</span><span class="mi">1</span><span class="p">);</span>
167166

168167
<span class="n">scalar_t</span> <span class="n">dt</span> <span class="o">=</span> <span class="mf">2.</span><span class="p">;</span>
169-
<span class="n">pressio</span><span class="o">::</span><span class="n">ode</span><span class="o">::</span><span class="n">advance_n_steps</span><span class="p">(</span><span class="n">stepperObj</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="n">dt</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">nonLinSolver</span><span class="p">);</span>
168+
<span class="n">pressio</span><span class="o">::</span><span class="n">ode</span><span class="o">::</span><span class="n">advance_n_steps</span><span class="p">(</span><span class="n">problem</span><span class="p">,</span> <span class="n">romState</span><span class="p">,</span> <span class="mf">0.0</span><span class="p">,</span> <span class="n">dt</span><span class="p">,</span> <span class="mi">1</span><span class="p">,</span> <span class="n">nonLinSolver</span><span class="p">);</span>
170169
<span class="n">std</span><span class="o">::</span><span class="n">cout</span> <span class="o">&lt;&lt;</span> <span class="n">romState</span> <span class="o">&lt;&lt;</span> <span class="n">std</span><span class="o">::</span><span class="n">endl</span><span class="p">;</span>
171170

172171
<span class="n">pressio</span><span class="o">::</span><span class="n">log</span><span class="o">::</span><span class="n">finalize</span><span class="p">();</span>

docs/latex/md_pages_rom_galerkin_default_explicit.tex

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@
7575
\DoxyCodeLine{ \textcolor{keyword}{const} scalar\_t dt = 1.;}
7676
\DoxyCodeLine{ \textcolor{keyword}{const} \textcolor{keywordtype}{int} num\_steps = 3;}
7777
\DoxyCodeLine{ Observer obs;}
78-
\DoxyCodeLine{ pressio::ode::advance\_n\_steps\_and\_observe(}
79-
\DoxyCodeLine{ problem.stepper(), romState, 0., dt, num\_steps, obs);}
78+
\DoxyCodeLine{ pressio::ode::advance\_n\_steps\_and\_observe(problem, romState, 0., dt, num\_steps, obs);}
8079
\DoxyCodeLine{}
8180
\DoxyCodeLine{ pressio::log::finalize();}
8281
\DoxyCodeLine{\}}

docs/latex/md_pages_rom_galerkin_default_explicit_custom_types.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@
264264
\DoxyCodeLine{ \textcolor{keyword}{const} scalar\_t dt = 1.;}
265265
\DoxyCodeLine{ \textcolor{keyword}{const} \textcolor{keywordtype}{int} num\_steps = 3;}
266266
\DoxyCodeLine{ Observer obs;}
267-
\DoxyCodeLine{ pressio::ode::advance\_n\_steps\_and\_observe(}
268-
\DoxyCodeLine{ problem.stepper(), romState, 0., dt, num\_steps, obs);}
267+
\DoxyCodeLine{ pressio::ode::advance\_n\_steps\_and\_observe(problem, romState, 0., dt, num\_steps, obs);}
269268
\DoxyCodeLine{}
270269
\DoxyCodeLine{ pressio::log::finalize();}
270+
\DoxyCodeLine{\}}
271271

272272
\end{DoxyCode}
273273

docs/latex/md_pages_rom_galerkin_default_implicit.tex

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,15 @@
8080
\DoxyCodeLine{ \textcolor{keyword}{auto} problem = pressio::rom::galerkin::create\_default\_implicit\_problem}
8181
\DoxyCodeLine{ (odescheme, fomSystem, decoder, romState, fomReferenceState);}
8282
\DoxyCodeLine{ \textcolor{keyword}{using} problem\_t = decltype(problem);}
83-
\DoxyCodeLine{ \textcolor{keyword}{auto} \& stepperObj = problem.stepper();}
8483
\DoxyCodeLine{}
8584
\DoxyCodeLine{ \textcolor{keyword}{using} galerkin\_jacobian\_t = \textcolor{keyword}{typename} pressio::Traits<problem\_t>::galerkin\_jacobian\_type;}
8685
\DoxyCodeLine{ \textcolor{keyword}{using} lin\_solver\_t = pls::Solver<pls::iterative::LSCG, galerkin\_jacobian\_t>;}
8786
\DoxyCodeLine{ lin\_solver\_t linearSolverObj;}
88-
\DoxyCodeLine{ \textcolor{keyword}{auto} nonLinSolver = pnonls::create\_newton\_raphson(stepperObj, romState, linearSolverObj);}
87+
\DoxyCodeLine{ \textcolor{keyword}{auto} nonLinSolver = pnonls::create\_newton\_raphson(problem, romState, linearSolverObj);}
8988
\DoxyCodeLine{ nonLinSolver.setMaxIterations(1);}
9089
\DoxyCodeLine{}
9190
\DoxyCodeLine{ scalar\_t dt = 2.;}
92-
\DoxyCodeLine{ pressio::ode::advance\_n\_steps(stepperObj, romState, 0.0, dt, 1, nonLinSolver);}
91+
\DoxyCodeLine{ pressio::ode::advance\_n\_steps(problem, romState, 0.0, dt, 1, nonLinSolver);}
9392
\DoxyCodeLine{ std::cout << romState << std::endl;}
9493
\DoxyCodeLine{}
9594
\DoxyCodeLine{ pressio::log::finalize();}

docs/m.math.cache

0 Bytes
Binary file not shown.

docs/xml/md_pages_rom_galerkin_default_explicit.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@
7979
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/>scalar_t<sp/>dt<sp/>=<sp/>1.;</highlight></codeline>
8080
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>num_steps<sp/>=<sp/>3;</highlight></codeline>
8181
<codeline><highlight class="normal"><sp/><sp/>Observer<sp/>obs;</highlight></codeline>
82-
<codeline><highlight class="normal"><sp/><sp/>pressio::ode::advance_n_steps_and_observe(</highlight></codeline>
83-
<codeline><highlight class="normal"><sp/><sp/><sp/><sp/>problem.stepper(),<sp/>romState,<sp/>0.,<sp/>dt,<sp/>num_steps,<sp/>obs);</highlight></codeline>
82+
<codeline><highlight class="normal"><sp/><sp/>pressio::ode::advance_n_steps_and_observe(problem,<sp/>romState,<sp/>0.,<sp/>dt,<sp/>num_steps,<sp/>obs);</highlight></codeline>
8483
<codeline><highlight class="normal"></highlight></codeline>
8584
<codeline><highlight class="normal"><sp/><sp/>pressio::log::finalize();</highlight></codeline>
8685
<codeline><highlight class="normal">}</highlight></codeline>

docs/xml/md_pages_rom_galerkin_default_explicit_custom_types.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,10 @@
267267
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/>scalar_t<sp/>dt<sp/>=<sp/>1.;</highlight></codeline>
268268
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">const</highlight><highlight class="normal"><sp/></highlight><highlight class="keywordtype">int</highlight><highlight class="normal"><sp/>num_steps<sp/>=<sp/>3;</highlight></codeline>
269269
<codeline><highlight class="normal"><sp/><sp/>Observer<sp/>obs;</highlight></codeline>
270-
<codeline><highlight class="normal"><sp/><sp/>pressio::ode::advance_n_steps_and_observe(</highlight></codeline>
271-
<codeline><highlight class="normal"><sp/><sp/><sp/><sp/><sp/><sp/>problem.stepper(),<sp/>romState,<sp/>0.,<sp/>dt,<sp/>num_steps,<sp/>obs);</highlight></codeline>
270+
<codeline><highlight class="normal"><sp/><sp/>pressio::ode::advance_n_steps_and_observe(problem,<sp/>romState,<sp/>0.,<sp/>dt,<sp/>num_steps,<sp/>obs);</highlight></codeline>
272271
<codeline><highlight class="normal"></highlight></codeline>
273272
<codeline><highlight class="normal"><sp/><sp/>pressio::log::finalize();</highlight></codeline>
273+
<codeline><highlight class="normal">}</highlight></codeline>
274274
</programlisting> </para>
275275
</sect1>
276276
</detaileddescription>

docs/xml/md_pages_rom_galerkin_default_implicit.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,15 @@
8484
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">auto</highlight><highlight class="normal"><sp/>problem<sp/>=<sp/>pressio::rom::galerkin::create_default_implicit_problem</highlight></codeline>
8585
<codeline><highlight class="normal"><sp/><sp/><sp/><sp/>(odescheme,<sp/>fomSystem,<sp/>decoder,<sp/>romState,<sp/>fomReferenceState);</highlight></codeline>
8686
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">using</highlight><highlight class="normal"><sp/>problem_t<sp/>=<sp/>decltype(problem);</highlight></codeline>
87-
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">auto</highlight><highlight class="normal"><sp/>&amp;<sp/>stepperObj<sp/>=<sp/>problem.stepper();</highlight></codeline>
8887
<codeline><highlight class="normal"></highlight></codeline>
8988
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">using</highlight><highlight class="normal"><sp/>galerkin_jacobian_t<sp/>=<sp/></highlight><highlight class="keyword">typename</highlight><highlight class="normal"><sp/>pressio::Traits&lt;problem_t&gt;::galerkin_jacobian_type;</highlight></codeline>
9089
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">using</highlight><highlight class="normal"><sp/>lin_solver_t<sp/>=<sp/>pls::Solver&lt;pls::iterative::LSCG,<sp/>galerkin_jacobian_t&gt;;</highlight></codeline>
9190
<codeline><highlight class="normal"><sp/><sp/>lin_solver_t<sp/>linearSolverObj;</highlight></codeline>
92-
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">auto</highlight><highlight class="normal"><sp/>nonLinSolver<sp/>=<sp/>pnonls::create_newton_raphson(stepperObj,<sp/>romState,<sp/>linearSolverObj);</highlight></codeline>
91+
<codeline><highlight class="normal"><sp/><sp/></highlight><highlight class="keyword">auto</highlight><highlight class="normal"><sp/>nonLinSolver<sp/>=<sp/>pnonls::create_newton_raphson(problem,<sp/>romState,<sp/>linearSolverObj);</highlight></codeline>
9392
<codeline><highlight class="normal"><sp/><sp/>nonLinSolver.setMaxIterations(1);</highlight></codeline>
9493
<codeline><highlight class="normal"></highlight></codeline>
9594
<codeline><highlight class="normal"><sp/><sp/>scalar_t<sp/>dt<sp/>=<sp/>2.;</highlight></codeline>
96-
<codeline><highlight class="normal"><sp/><sp/>pressio::ode::advance_n_steps(stepperObj,<sp/>romState,<sp/>0.0,<sp/>dt,<sp/>1,<sp/>nonLinSolver);</highlight></codeline>
95+
<codeline><highlight class="normal"><sp/><sp/>pressio::ode::advance_n_steps(problem,<sp/>romState,<sp/>0.0,<sp/>dt,<sp/>1,<sp/>nonLinSolver);</highlight></codeline>
9796
<codeline><highlight class="normal"><sp/><sp/>std::cout<sp/>&lt;&lt;<sp/>romState<sp/>&lt;&lt;<sp/>std::endl;</highlight></codeline>
9897
<codeline><highlight class="normal"></highlight></codeline>
9998
<codeline><highlight class="normal"><sp/><sp/>pressio::log::finalize();</highlight></codeline>

0 commit comments

Comments
 (0)