From 6edf6ce1ed72842e939323a7d276c6d290860c45 Mon Sep 17 00:00:00 2001 From: maggul Date: Mon, 4 Nov 2024 22:45:06 -0600 Subject: [PATCH] comment and WriteParameters update --- .gitlab/radiuss-spack-configs | 2 +- .gitlab/uberenv | 2 +- src/arkode/arkode_lsrkstep.c | 18 +++++++++++------- src/arkode/arkode_lsrkstep_io.c | 18 ------------------ 4 files changed, 13 insertions(+), 27 deletions(-) diff --git a/.gitlab/radiuss-spack-configs b/.gitlab/radiuss-spack-configs index 89c2074e46..1264a6db12 160000 --- a/.gitlab/radiuss-spack-configs +++ b/.gitlab/radiuss-spack-configs @@ -1 +1 @@ -Subproject commit 89c2074e466d454c77ec17249cbdf8555d183388 +Subproject commit 1264a6db12f451153a5cb22a32a1b7ba2faa5fc2 diff --git a/.gitlab/uberenv b/.gitlab/uberenv index ec6fd144c8..0d00dc8e19 160000 --- a/.gitlab/uberenv +++ b/.gitlab/uberenv @@ -1 +1 @@ -Subproject commit ec6fd144c814ce30a6487db9fb8294def606afda +Subproject commit 0d00dc8e19a889ba07ae433590b87533c4b5b3da diff --git a/src/arkode/arkode_lsrkstep.c b/src/arkode/arkode_lsrkstep.c index 9c84e7463c..bd75d73fe8 100644 --- a/src/arkode/arkode_lsrkstep.c +++ b/src/arkode/arkode_lsrkstep.c @@ -358,7 +358,7 @@ int lsrkStep_Init(ARKodeMem ark_mem, int init_type) } /* Signal to shared arkode module that full RHS evaluations are required */ - ark_mem->call_fullrhs = SUNTRUE; + ark_mem->call_fullrhs = SUNFALSE; return ARK_SUCCESS; } @@ -462,9 +462,11 @@ int lsrkStep_FullRHS(ARKodeMem ark_mem, sunrealtype t, N_Vector y, N_Vector f, weighted local error if an embedding is present; otherwise it should be 0. - The input/output variable nflagPtr is used to gauge convergence - of any algebraic solvers within the step. As this routine - involves no algebraic solve, it is set to 0 (success). + The input/output variable nflagPtr is generally used in ARKODE + to gauge the convergence of any algebraic solvers. However, since + the STS step routines do not involve an algebraic solve, this variable + instead serves to identify possible ARK_RETRY_STEP returns within this + routine. The return value from this routine is: 0 => step completed successfully @@ -744,9 +746,11 @@ int lsrkStep_TakeStepRKC(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr) weighted local error if an embedding is present; otherwise it should be 0. - The input/output variable nflagPtr is used to gauge convergence - of any algebraic solvers within the step. As this routine - involves no algebraic solve, it is set to 0 (success). + The input/output variable nflagPtr is generally used in ARKODE + to gauge the convergence of any algebraic solvers. However, since + the STS step routines do not involve an algebraic solve, this variable + instead serves to identify possible ARK_RETRY_STEP returns within this + routine. The return value from this routine is: 0 => step completed successfully diff --git a/src/arkode/arkode_lsrkstep_io.c b/src/arkode/arkode_lsrkstep_io.c index c7e91fe1be..d2f8ce4c41 100644 --- a/src/arkode/arkode_lsrkstep_io.c +++ b/src/arkode/arkode_lsrkstep_io.c @@ -678,32 +678,14 @@ int lsrkStep_WriteParameters(ARKodeMem ark_mem, FILE* fp) case SUNFALSE: fprintf(fp, " Maximum number of stages allowed = %i\n", step_mem->stage_max_limit); - fprintf(fp, " Maximum number of stages used = %i\n", step_mem->stage_max); - fprintf(fp, " Num of step when the last dom eig call happened= %li\n", - step_mem->dom_eig_nst); - fprintf(fp, " Num of successful steps = %li\n", step_mem->step_nst); - fprintf(fp, " Current real part of the dom eig = %" RSYM "\n", - step_mem->lambdaR); - fprintf(fp, " Current imag part of the dom eig = %" RSYM "\n", - step_mem->lambdaI); fprintf(fp, " Current spectral radius = %" RSYM "\n", step_mem->spectral_radius); - fprintf(fp, " Current number of required stages = %i\n", - step_mem->req_stages); - fprintf(fp, " Maximum spectral radius = %" RSYM "\n", - step_mem->spectral_radius_max); - fprintf(fp, " Minimum spectral radius = %" RSYM "\n", - step_mem->spectral_radius_min); fprintf(fp, " Safety factor for the dom eig = %" RSYM "\n", step_mem->dom_eig_safety); fprintf(fp, " Max num of successful steps before new dom eig update = %i\n", step_mem->dom_eig_freq); - fprintf(fp, " Flag to indicate new dom eig is needed = %d\n", - step_mem->dom_eig_update); fprintf(fp, " Flag to indicate Jacobian is constant = %d\n", step_mem->const_Jac); - fprintf(fp, " Flag to indicate dom eig is current = %d\n", - step_mem->dom_eig_is_current); break; default: arkProcessError(ark_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__,