-
Notifications
You must be signed in to change notification settings - Fork 23
Add pqi_pqo_files to tests #289
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #289 +/- ##
=======================================
Coverage 84.89% 84.89%
=======================================
Files 9 9
Lines 1476 1476
Branches 257 257
=======================================
Hits 1253 1253
Misses 193 193
Partials 30 30 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
rkingsbury
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Off to a good start @SuixiongTay ; thanks! Can you rename the folder to tests/files_phreeqc please?
| @@ -0,0 +1,14 @@ | |||
| DATABASE C:\Program Files (x86)\USGS\Phreeqc Interactive 3.7.3-15968\database\phreeqc.dat | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this line necessary? Since it points to a local directory (C:\...) it's not going to be useful (or readable) by our wrapper). Same goes for the other input files. If omitted, does PHREEQC just use its default database?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's cross validate the current DATABASE directory structure with Vineet's IPHREEQC schema to check. Tagging @vineetbansal
We could also specify the parser to skip entries containing the keyword DATABASE. Ideally, the test will check the following lines in the pqo output to validate the initial solution block:
------------------
Reading data base.
------------------
------------------------------------
Reading input data for simulation 1.
------------------------------------
-------------------------------------------
Beginning of initial solution calculations.
-------------------------------------------
------------------
End of simulation.
------------------
And we can remove the below:
Input file: C:\Users\...
Output file: C:\Users\...
Database file: C:\Program Files (x86)\USGS\Phreeqc Interactive 3.7.3-15968\database\phreeqc.dat
------------------------------------
Reading input data for simulation 2.
------------------------------------
-------------------------------
End of Run after 0.084 Seconds.
-------------------------------
What do you think? @rkingsbury
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed; that sounds like a good approach.
|
I'll go ahead and merge and we can clean up the DATABASE lines later if it turns out they aren't needed. |
|
Sorry I'm getting to this kinda late, after its been merged. I thought this suggestion of including pqi/pqo files was towards our wrapper repository - pyphreeqc. That way when we added a (private) Note that a Also, in that case - if the ability to run strings and get strings back is what we're happy with, we may already be almost done with the wrapper :) Or perhaps this in anticipation of |
Oh, sorry for the misunderstanding there. We could do that too (or instead) if helpful.
This is probably the original source of my confusion. I had always envisioned the wrapper to become part of pyEQL itself (or at least, to be distributed with pyEQL and not something a user would ever use standalone). That doesn't necessarily mean it has to live inside the
Hmmm, this is a good point. I was thinking that a
Yeah, I think the first step of mapping For the second step - "getting strings back" - I want the wrapper to have lightweight indexing methods for retrieving specific properties from the returned string / |
Summary
Added
pqiandpqofiles for pure water (25 °C and pH = 7).Todos
PHREEQC input:
PHREEQC input: