Merge pull request #272 from ludwig-cf/patch-0.20.1

Bug fix: add missing petsc stub
ludwig-cf · Jul 25, 2023 · c21dba0 · c21dba0
2 parents 8e5c967 + 84e300b
commit c21dba0
Show file tree

Hide file tree

Showing 4 changed files with 99 additions and 1 deletion.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,10 @@
 
 ### Changes
 
+version 0.20.1
+- Issue 271: missing stub prevents compilation at some compiler optimisation
+             levels.
+
 version 0.20.0
 
 - IMPORTANT: The input file can no longer be specified as a command

diff --git a/src/psi_petsc.c b/src/psi_petsc.c
@@ -172,6 +172,18 @@ int psi_solver_petsc_solve(psi_solver_petsc_t * solver, int ntimestep) {
   return -1;
 }
 
+/*****************************************************************************
+ *
+ *  psi_solver_petsc_var_epsilon_solve
+ *
+ *****************************************************************************/
+
+int psi_solver_petsc_var_epsilon_solve(psi_solver_petsc_t * solver, int nt) {
+
+  /* No implementation */
+  return -1;
+}
+
 #else
 
 #include "petscdmda.h"

diff --git a/tests/unit/test_psi_solver_petsc.c b/tests/unit/test_psi_solver_petsc.c
@@ -20,6 +20,9 @@
 #include "psi_petsc.h"
 
 int test_psi_solver_petsc_create(pe_t * pe);
+int test_psi_solver_petsc_solve(pe_t * pe);
+int test_psi_solver_petsc_var_epsilon_create(pe_t * pe);
+int test_psi_solver_petsc_var_epsilon_solve(pe_t * pe);
 
 /*****************************************************************************
  *
@@ -34,6 +37,9 @@ int test_psi_solver_petsc_suite(void) {
   pe_create(MPI_COMM_WORLD, PE_QUIET, &pe);
 
   test_psi_solver_petsc_create(pe);
+  test_psi_solver_petsc_solve(pe);
+  test_psi_solver_petsc_var_epsilon_create(pe);
+  test_psi_solver_petsc_var_epsilon_solve(pe);
 
   pe_info(pe, "%-9s %s\n", "PASS", __FILE__);
   pe_free(pe);
@@ -65,3 +71,79 @@ int test_psi_solver_petsc_create(pe_t * pe) {
 
   return 0;
 }
+
+/*****************************************************************************
+ *
+ *  test_psi_solver_petsc_solve
+ *
+ *****************************************************************************/
+
+int test_psi_solver_petsc_solve(pe_t * pe) {
+
+  int ifail = 0;
+  int isInitialised = 0;
+
+  PetscInitialised(&isInitialised);
+
+  if (isInitialised == 0) {
+    psi_solver_petsc_t * petsc = NULL;
+    int nt = 0;
+
+    ifail = psi_solver_petsc_solve(petsc, nt);
+    assert(ifail != 0);
+    if (ifail != 0) ifail = 0;
+  }
+
+  return 0;
+}
+
+/*****************************************************************************
+ *
+ *  test_psi_solver_petsc_var_epsilon_create
+ *
+ *****************************************************************************/
+
+int test_psi_solver_petsc_var_epsilon_create(pe_t * pe) {
+
+  int ifail = 0;
+  int isInitialised = 0;
+
+  PetscInitialised(&isInitialised);
+
+  if (isInitialised == 0) {
+    psi_t * psi = NULL;
+    var_epsilon_t user = {0};
+    psi_solver_petsc_t * petsc = NULL;
+
+    ifail = psi_solver_petsc_var_epsilon_create(psi, user, &petsc);
+    assert(ifail != 0);
+    if (ifail != 0) ifail = 0;
+  }
+
+  return 0;
+}
+
+/*****************************************************************************
+ *
+ *  test_psi_solver_petsc_var_epsilon_solve
+ *
+ *****************************************************************************/
+
+int test_psi_solver_petsc_var_epsilon_solve(pe_t * pe) {
+
+  int ifail = 0;
+  int isInitialised = 0;
+
+  PetscInitialised(&isInitialised);
+
+  if (isInitialised == 0) {
+    psi_solver_petsc_t * petsc = NULL;
+    int nt = 0;
+
+    ifail = psi_solver_petsc_var_epsilon_solve(petsc, nt);
+    assert(ifail != 0);
+    if (ifail != 0) ifail = 0;
+  }
+
+  return 0;
+}
diff --git a/version.h b/version.h
@@ -14,6 +14,6 @@
 
 #define LUDWIG_MAJOR_VERSION 0
 #define LUDWIG_MINOR_VERSION 20
-#define LUDWIG_PATCH_VERSION 0
+#define LUDWIG_PATCH_VERSION 1
 
 #endif