build and test failure

LLNL · Oct 4, 2024 · 9b7777a · 9b7777a
1 parent 7d5cd6c
commit 9b7777a
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 11 deletions.
diff --git a/include/arkode/arkode_lsrkstep.h b/include/arkode/arkode_lsrkstep.h
@@ -95,7 +95,8 @@ SUNDIALS_EXPORT int LSRKStepGetNumRhsEvals(void* arkode_mem, int num_rhs_fn,
 SUNDIALS_EXPORT int LSRKStepGetNumDomEigUpdates(void* arkode_mem,
                                                 long int* dom_eig_num_evals);
 
-SUNDIALS_EXPORT int LSRKStepGetNumRetiredSteps(void* arkode_mem, long int* num_of_retries);
+SUNDIALS_EXPORT int LSRKStepGetNumRetiredSteps(void* arkode_mem,
+                                               long int* num_of_retries);
 
 SUNDIALS_EXPORT int LSRKStepGetMaxNumStages(void* arkode_mem, int* stage_max);
 

diff --git a/src/arkode/arkode_lsrkstep.c b/src/arkode/arkode_lsrkstep.c
@@ -1297,7 +1297,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS",
                        "F_%i(:) =", j);
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
     N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, step_mem->Fe,
@@ -1339,7 +1339,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS",
                        "F_%i(:) =", j);
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
     N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, step_mem->Fe,
@@ -1376,7 +1376,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS", "F_%i(:) =", (int)(in * (in + 1) / 2);
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
   cvals[0] = (rn - ONE) / (TWO * rn - ONE);
@@ -1424,7 +1424,7 @@ int lsrkStep_TakeStepSSPs3(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSPs3", "stage RHS", "F_%i(:) =", j;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
     N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * rat, step_mem->Fe,
@@ -1574,7 +1574,7 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSP43", "stage RHS", "F_%i(:) =", 2;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
   N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * p5, step_mem->Fe, ark_mem->ycur);
@@ -1607,7 +1607,7 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSP43", "stage RHS", "F_%i(:) =", 3;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
   cvals[0] = ONE / THREE;
@@ -1649,7 +1649,7 @@ int lsrkStep_TakeStepSSP43(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSP43", "stage RHS", "F_%i(:) =", 4;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
   N_VLinearSum(ONE, ark_mem->ycur, ark_mem->h * p5, step_mem->Fe, ark_mem->ycur);
@@ -1797,7 +1797,7 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSP104", "stage RHS", "F_%i(:) =", j;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
     N_VLinearSum(ONE, ark_mem->ycur, onesixth * ark_mem->h, step_mem->Fe,
@@ -1843,7 +1843,7 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSP104", "stage RHS", "F_%i(:) =", j;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
     N_VLinearSum(ONE, ark_mem->ycur, onesixth * ark_mem->h, step_mem->Fe,
@@ -1886,7 +1886,7 @@ int lsrkStep_TakeStepSSP104(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
 #ifdef SUNDIALS_LOGGING_EXTRA_DEBUG
     SUNLogger_QueueMsg(ARK_LOGGER, SUN_LOGLEVEL_DEBUG,
                        "ARKODE::lsrkStep_TakeStepSSP104", "stage RHS", "F_%i(:) =", 10;
-    N_VPrintFile(ark_mem->Fe, ARK_LOGGER->debug_fp);
+    N_VPrintFile(step_mem->Fe, ARK_LOGGER->debug_fp);
 #endif
 
   cvals[0] = SUN_RCONST(0.6);

diff --git a/src/arkode/fmod_int32/farkode_lsrkstep_mod.c b/src/arkode/fmod_int32/farkode_lsrkstep_mod.c
@@ -444,6 +444,20 @@ SWIGEXPORT int _wrap_FLSRKStepGetNumDomEigUpdates(void *farg1, long *farg2) {
 }
 
 
+SWIGEXPORT int _wrap_FLSRKStepGetNumRetiredSteps(void *farg1, long *farg2) {
+  int fresult ;
+  void *arg1 = (void *) 0 ;
+  long *arg2 = (long *) 0 ;
+  int result;
+
+  arg1 = (void *)(farg1);
+  arg2 = (long *)(farg2);
+  result = (int)LSRKStepGetNumRetiredSteps(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
 SWIGEXPORT int _wrap_FLSRKStepGetMaxNumStages(void *farg1, int *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;

diff --git a/src/arkode/fmod_int32/farkode_lsrkstep_mod.f90 b/src/arkode/fmod_int32/farkode_lsrkstep_mod.f90
@@ -58,6 +58,7 @@ module farkode_lsrkstep_mod
  public :: FLSRKStepSetSSPStageNum
  public :: FLSRKStepGetNumRhsEvals
  public :: FLSRKStepGetNumDomEigUpdates
+ public :: FLSRKStepGetNumRetiredSteps
  public :: FLSRKStepGetMaxNumStages
 
 ! WRAPPER DECLARATIONS
@@ -198,6 +199,15 @@ function swigc_FLSRKStepGetNumDomEigUpdates(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
+function swigc_FLSRKStepGetNumRetiredSteps(farg1, farg2) &
+bind(C, name="_wrap_FLSRKStepGetNumRetiredSteps") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
 function swigc_FLSRKStepGetMaxNumStages(farg1, farg2) &
 bind(C, name="_wrap_FLSRKStepGetMaxNumStages") &
 result(fresult)
@@ -482,6 +492,22 @@ function FLSRKStepGetNumDomEigUpdates(arkode_mem, dom_eig_num_evals) &
 swig_result = fresult
 end function
 
+function FLSRKStepGetNumRetiredSteps(arkode_mem, num_of_retries) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: arkode_mem
+integer(C_LONG), dimension(*), target, intent(inout) :: num_of_retries
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = arkode_mem
+farg2 = c_loc(num_of_retries(1))
+fresult = swigc_FLSRKStepGetNumRetiredSteps(farg1, farg2)
+swig_result = fresult
+end function
+
 function FLSRKStepGetMaxNumStages(arkode_mem, stage_max) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING

diff --git a/src/arkode/fmod_int64/farkode_lsrkstep_mod.c b/src/arkode/fmod_int64/farkode_lsrkstep_mod.c
@@ -444,6 +444,20 @@ SWIGEXPORT int _wrap_FLSRKStepGetNumDomEigUpdates(void *farg1, long *farg2) {
 }
 
 
+SWIGEXPORT int _wrap_FLSRKStepGetNumRetiredSteps(void *farg1, long *farg2) {
+  int fresult ;
+  void *arg1 = (void *) 0 ;
+  long *arg2 = (long *) 0 ;
+  int result;
+
+  arg1 = (void *)(farg1);
+  arg2 = (long *)(farg2);
+  result = (int)LSRKStepGetNumRetiredSteps(arg1,arg2);
+  fresult = (int)(result);
+  return fresult;
+}
+
+
 SWIGEXPORT int _wrap_FLSRKStepGetMaxNumStages(void *farg1, int *farg2) {
   int fresult ;
   void *arg1 = (void *) 0 ;

diff --git a/src/arkode/fmod_int64/farkode_lsrkstep_mod.f90 b/src/arkode/fmod_int64/farkode_lsrkstep_mod.f90
@@ -58,6 +58,7 @@ module farkode_lsrkstep_mod
  public :: FLSRKStepSetSSPStageNum
  public :: FLSRKStepGetNumRhsEvals
  public :: FLSRKStepGetNumDomEigUpdates
+ public :: FLSRKStepGetNumRetiredSteps
  public :: FLSRKStepGetMaxNumStages
 
 ! WRAPPER DECLARATIONS
@@ -198,6 +199,15 @@ function swigc_FLSRKStepGetNumDomEigUpdates(farg1, farg2) &
 integer(C_INT) :: fresult
 end function
 
+function swigc_FLSRKStepGetNumRetiredSteps(farg1, farg2) &
+bind(C, name="_wrap_FLSRKStepGetNumRetiredSteps") &
+result(fresult)
+use, intrinsic :: ISO_C_BINDING
+type(C_PTR), value :: farg1
+type(C_PTR), value :: farg2
+integer(C_INT) :: fresult
+end function
+
 function swigc_FLSRKStepGetMaxNumStages(farg1, farg2) &
 bind(C, name="_wrap_FLSRKStepGetMaxNumStages") &
 result(fresult)
@@ -482,6 +492,22 @@ function FLSRKStepGetNumDomEigUpdates(arkode_mem, dom_eig_num_evals) &
 swig_result = fresult
 end function
 
+function FLSRKStepGetNumRetiredSteps(arkode_mem, num_of_retries) &
+result(swig_result)
+use, intrinsic :: ISO_C_BINDING
+integer(C_INT) :: swig_result
+type(C_PTR) :: arkode_mem
+integer(C_LONG), dimension(*), target, intent(inout) :: num_of_retries
+integer(C_INT) :: fresult 
+type(C_PTR) :: farg1 
+type(C_PTR) :: farg2 
+
+farg1 = arkode_mem
+farg2 = c_loc(num_of_retries(1))
+fresult = swigc_FLSRKStepGetNumRetiredSteps(farg1, farg2)
+swig_result = fresult
+end function
+
 function FLSRKStepGetMaxNumStages(arkode_mem, stage_max) &
 result(swig_result)
 use, intrinsic :: ISO_C_BINDING