fix compile errors with pflotran master branch

[smolins]

Ok. We have a circular problem here. Alquimia's CI build currently uses petsc's pflotran build but this fails because this is still not updated to current pflotran's master, which has redefined this variable. I'll have to update the test to use pflotran's master for this to go forward.

[balay]

one of the choices I didn't explore is conditional code that works both with pflotran release [based on petsc-3.9] - and pflotran master [based on petsc master]

I didn't check if pflotran has version info in some includes - but something wrt petsc

if PETSC_VERSION_LE(3,9,99)

old code

else

new code

endif

On Wed, 11 Jul 2018, Sergi Molins wrote:

Ok. We have a circular problem here. Alquimia's CI build currently uses petsc's pflotran build but this fails because this is still not updated to current pflotran's master, which has redefined this variable. I'll have to update the test to use pflotran's master for this to go forward.

[balay]

BTW: If you are using --download-pflotran option from PETSc - you can use additional option --download-pflotran-commit=origin/master [to switch it to install pflotran master branch].

Obviously this build should be done in petsc master branch.

I can change this value in petsc master branch - but will have to remember to switch it to a pflotran release version at some point..

On Wed, 11 Jul 2018, Sergi Molins wrote:

Ok. We have a circular problem here. Alquimia's CI build currently uses petsc's pflotran build but this fails because this is still not updated to current pflotran's master, which has redefined this variable. I'll have to update the test to use pflotran's master for this to go forward.