diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6dbd077e..a52367e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -269,7 +269,7 @@ jobs: run: | brew reinstall gcc brew install ninja yaml-cpp - ls -alR /usr/local/Cellar/ + # ls -alR /usr/local/Cellar/ - name: Verify gfortran run: | @@ -286,6 +286,10 @@ jobs: working-directory: ${{ github.workspace }}/build run: ../phreeqcrm-${{ env.VER_STRING }}/configure --enable-fortran-test --with-yaml-cpp + - name: Print phreeqcrm.pc + working-directory: ${{ github.workspace }}/build + run: cat phreeqcrm.pc + - name: Build with autotools working-directory: ${{ github.workspace }}/build run: make -j4 diff --git a/src/BMI_interface_C.cpp b/src/BMI_interface_C.cpp index 750aa7be..08df93f3 100644 --- a/src/BMI_interface_C.cpp +++ b/src/BMI_interface_C.cpp @@ -651,21 +651,21 @@ BMI_GetGridZ(int id, const int grid, double* z) } /* ---------------------------------------------------------------------- */ int -GetGridNodeCount(int id, const int grid) +BMI_GetGridNodeCount(int id, const int grid) /* ---------------------------------------------------------------------- */ { fprintf(stderr, "Not implemented\n"); exit(4); } /* ---------------------------------------------------------------------- */ int -GetGridEdgeCount(int id, const int grid) +BMI_GetGridEdgeCount(int id, const int grid) /* ---------------------------------------------------------------------- */ { fprintf(stderr, "Not implemented\n"); exit(4); } /* ---------------------------------------------------------------------- */ int -GetGridFaceCount(int id, const int grid) +BMI_GetGridFaceCount(int id, const int grid) /* ---------------------------------------------------------------------- */ { fprintf(stderr, "Not implemented\n"); exit(4); diff --git a/src/BMI_interface_C.h b/src/BMI_interface_C.h index 44b12d69..a5c9746c 100644 --- a/src/BMI_interface_C.h +++ b/src/BMI_interface_C.h @@ -1196,15 +1196,15 @@ extern "C" { /** @a BMI_GetGridNodeCount is not implemented. */ - IRM_DLL_EXPORT int GetGridNodeCount(int id, const int grid); + IRM_DLL_EXPORT int BMI_GetGridNodeCount(int id, const int grid); /** @a BMI_GetGridEdgeCount is not implemented. */ - IRM_DLL_EXPORT int GetGridEdgeCount(int id, const int grid); + IRM_DLL_EXPORT int BMI_GetGridEdgeCount(int id, const int grid); /** @a BMI_GetGridFaceCount is not implemented. */ - IRM_DLL_EXPORT int GetGridFaceCount(int id, const int grid); + IRM_DLL_EXPORT int BMI_GetGridFaceCount(int id, const int grid); /** @a BMI_GetGridEdgeNodes is not implemented. */ diff --git a/src/RM_interface_C.cpp b/src/RM_interface_C.cpp index ac40dd27..ff2760e4 100644 --- a/src/RM_interface_C.cpp +++ b/src/RM_interface_C.cpp @@ -639,21 +639,21 @@ RM_BmiGetGridZ(int id, const int grid, double* z) } /* ---------------------------------------------------------------------- */ int -GetGridNodeCount(int id, const int grid) +RM_BmiGetGridNodeCount(int id, const int grid) /* ---------------------------------------------------------------------- */ { fprintf(stderr, "Not implemented\n"); exit(4); } /* ---------------------------------------------------------------------- */ int -GetGridEdgeCount(int id, const int grid) +RM_BmiGetGridEdgeCount(int id, const int grid) /* ---------------------------------------------------------------------- */ { fprintf(stderr, "Not implemented\n"); exit(4); } /* ---------------------------------------------------------------------- */ int -GetGridFaceCount(int id, const int grid) +RM_BmiGetGridFaceCount(int id, const int grid) /* ---------------------------------------------------------------------- */ { fprintf(stderr, "Not implemented\n"); exit(4); diff --git a/src/RM_interface_C.h b/src/RM_interface_C.h index 5c48c4db..e5635547 100644 --- a/src/RM_interface_C.h +++ b/src/RM_interface_C.h @@ -1202,15 +1202,15 @@ extern "C" { /** @a RM_BmiGetGridNodeCount is not implemented. */ - IRM_DLL_EXPORT int GetGridNodeCount(int id, const int grid); + IRM_DLL_EXPORT int RM_BmiGetGridNodeCount(int id, const int grid); /** @a RM_BmiGetGridEdgeCount is not implemented. */ - IRM_DLL_EXPORT int GetGridEdgeCount(int id, const int grid); + IRM_DLL_EXPORT int RM_BmiGetGridEdgeCount(int id, const int grid); /** @a RM_BmiGetGridFaceCount is not implemented. */ - IRM_DLL_EXPORT int GetGridFaceCount(int id, const int grid); + IRM_DLL_EXPORT int RM_BmiGetGridFaceCount(int id, const int grid); /** @a RM_BmiGetGridEdgeNodes is not implemented. */