Squashed 'src/phast/PhreeqcRM/' changes from b24b855c..dc6c23c4

dc6c23c4 Merge commit 'a64e10cb1caa6572fc504368e199c887727fefc1'
a64e10cb Squashed 'src/' changes from dc753eb6..1a20b699
c961e309 Merge pull request #163 from dlparkhurst/module
d11f4bce Added Print phreeqcrm.pc to autotools job
2613c85b Removed ls from 'Install gcc(gfortran) ninja yaml-cpp (macOS)' step
c695e939 renamed to RM_BmiGetGridNodeCount and BMI_GetGridNodeCount and others.

git-subtree-dir: src/phast/PhreeqcRM
git-subtree-split: dc6c23c41813565ecd93899c750f83c589cd5df2

.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

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);

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.
     */

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);

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.
     */