Merge branch 'standardize_names' into common_integrators

zingale · zingale · commit 889522bd6a05 · 2024-05-07T15:38:34.000-04:00
diff --git a/integration/utils/rkc_util.H b/integration/utils/rkc_util.H
@@ -42,7 +42,7 @@ amrex::Real rkc_init_dt (BurnT& state, IntT& rstate, const amrex::Real max_times
         rstate.y(i) = ysav(i);
     }
 
-    rstate.nfe++;
+    rstate.n_rhs+;
     amrex::Real est{};
 
     // compute the weights using the tolerances
@@ -106,7 +106,7 @@ int rkcrho (BurnT& state, IntT& rstate, const amrex::Real max_timestep, amrex::R
     // the eigenvector are normalized so that their Euclidean
     // norm has the constant value dynrm.
 
-    if (rstate.nsteps == 0) {
+    if (rstate.n_step == 0) {
         for (int i = 1; i <= INT_NEQS; ++i) {
             rstate.yjm1(i) = rstate.fn(i);
         }

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ amrex::Real rkc_init_dt (BurnT& state, IntT& rstate, const amrex::Real max_times`
`42`	`42`	`rstate.y(i) = ysav(i);`
`43`	`43`	`}`
`44`	`44`
`45`		`- rstate.nfe++;`
	`45`	`+ rstate.n_rhs+;`
`46`	`46`	`amrex::Real est{};`
`47`	`47`
`48`	`48`	`// compute the weights using the tolerances`
`@@ -106,7 +106,7 @@ int rkcrho (BurnT& state, IntT& rstate, const amrex::Real max_timestep, amrex::R`
`106`	`106`	`// the eigenvector are normalized so that their Euclidean`
`107`	`107`	`// norm has the constant value dynrm.`
`108`	`108`
`109`		`- if (rstate.nsteps == 0) {`
	`109`	`+ if (rstate.n_step == 0) {`
`110`	`110`	`for (int i = 1; i <= INT_NEQS; ++i) {`
`111`	`111`	`rstate.yjm1(i) = rstate.fn(i);`
`112`	`112`	`}`