113 Commits

Author SHA1 Message Date
David Parkhurst
a99253764f (void)sscanf, removed SKIP, removed PHREEQ98 2021-03-12 18:11:29 -07:00
Parkhurst, David L
e1465e3322 Commit from David's Email 2020-05-22; Implementing llnl-type databases with higher temperature nad pressure 2020-05-22 15:05:28 -06:00
David L Parkhurst
9bf1411f42 Updated to PHREEQC3 12386
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@12387 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2017-02-09 16:41:47 +00:00
David L Parkhurst
4405e60e4e Merged source up to phreeqc3-trunk SVN 10892
copied files from trunk and merged changes manually.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10893 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-03-04 18:13:43 +00:00
David L Parkhurst
174c739d26 Updated concrete source from concrete_parallel source (not using parallel).
Now going to run test cases on Linux.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10719 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2016-01-20 18:12:15 +00:00
David L Parkhurst
c15e56ad5b -potential not defined for solution read_raw.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10567 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-14 20:09:32 +00:00
David L Parkhurst
fb18be24e2 Tony's implementation of electric current.
Test case current1.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/concrete@10550 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-12-08 16:54:38 +00:00
David L Parkhurst
8f1eb25c3a Added SetScreenOn to C++, C, and Fortran.
Updated PhreeqcRM tests to include a call to the new methods.
Set minimum concentration (moles) to 1e-18 in Solution.cxx.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10255 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-09-15 16:41:50 +00:00
David L Parkhurst
eef31c954d Iterator bug.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10040 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-08-04 19:18:25 +00:00
David L Parkhurst
f15d9155fc GetSpeciesLogGammas
GetSurfaceDiffuseLayerConcentrations
GetSurfaceDiffuseLayerNames

Roughed in new methods. They appear to work but not tested much.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9907 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-06-29 18:23:12 +00:00
David L Parkhurst
383cc7f2c7 Estimate activities in PhreeqcRM
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9632 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2015-05-10 19:36:18 +00:00
David L Parkhurst
87ad76934b Working with gas phase.
Bug in calculation of total pressure of mix.
Other issues when element of a gas component was not present in the system.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8879 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-07-29 17:25:52 +00:00
David L Parkhurst
c843de8fb0 Got all Tests working with MPI except the units tester.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8556 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-13 01:06:32 +00:00
David L Parkhurst
f10f513716 Save only aqueous species in phreeqc species_map.
Added species_map to copy operator
made mg/L default for Solution.cxx
default species_save_on is false.
Added some defaults to documentation
added species_cpp test.

bug in species_utility_cpp.txt

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8543 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2014-03-04 20:08:26 +00:00
David L Parkhurst
a3110d47c3 Should zero soln_vol
And missed calculation of patm (pressure).

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8293 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-12-06 20:59:49 +00:00
David L Parkhurst
c80ebbc630 added soln_vol to cxxSolution.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8171 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-11-05 16:26:46 +00:00
David L Parkhurst
9d1f0e34e5 set unknown state just in case.
extra indent in write_raw for solution in front of -pH

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8071 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-09-23 18:25:40 +00:00
David L Parkhurst
6fd2cc8b59 Fixed missing -pressure in solution dump_raw and read_raw.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7867 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-07-31 23:22:25 +00:00
David L Parkhurst
701878af44 If total set to zero in Solution_modify, took log of zero to update la and failed to converge.
Added check not to update la unless both old and new totals are greater than zero.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7739 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-05-29 17:33:53 +00:00
David L Parkhurst
24ed8b5cc0 Tony's changes for gases.
Removes some more 's.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7653 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2013-04-26 16:57:25 +00:00
David L Parkhurst
c2f8b3bb42 Saved list of newly read entities (including _raw and _modify).
Limit checking to new versions.

Limit loop to new for initial calculations (solution, exchange, surface, gas phase).

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7218 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-12-18 16:36:06 +00:00
David L Parkhurst
6ac877e770 Step, problem mu requires ah2o to be 1.0.
changed mix constructor to reset ah2o 0.0 before mixing.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7073 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-11-09 23:23:49 +00:00
David L Parkhurst
9d4bb2e173 PHREEQC should now have no USE_MPI
Also no MERGE_FILES in PHREEQC

Not sure about deallocates in worker_closef

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7045 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-10-29 23:16:27 +00:00
David L Parkhurst
e13a4d8039 Think rewrite of rebalance is working, need to fix zone chemistry file for mpi.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7037 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-10-26 21:45:30 +00:00
David L Parkhurst
d4721e493e Wrote rebalance_load for MPI_Bcast
However, now need 4 configurations for IPhreeqc Debug/Release USE_MPI.



git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@7036 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-10-26 00:39:14 +00:00
David L Parkhurst
4c2e8c33c0 Modified to tidy exchange, gas_phase, ppassemblage, solution, ssassemblage, and surface when _raw or _modify are read. Set new_def for each. Had problem with equilibrium_phases as shown in eq_phase_mod test case. Probably will add amdtreat test case from which it was derived.
Tony revised density calculation.

Toyed with the following when testing for amdtreat in Copy equations to optimize into ineq_array
//if (x[i]->f > 1e-14/*0e-8*/ && x[i]->moles <= 0

checked for a null pointer in prep (could happen when _modify used).



git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-09-12 15:46:31 +00:00
David L Parkhurst
d96dc80f27 Runs ex4 correctly.
Think all output, including hdf is correct.

Skipped updating activities. OK?

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6872 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-08-16 15:11:11 +00:00
David L Parkhurst
881ca8f2b6 debugging and optimizing
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6857 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-08-06 18:35:40 +00:00
David L Parkhurst
8b0481a1ee Working on efficiency of updating Solution.cxx
Need to revise solution_modify.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6856 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-08-05 19:12:28 +00:00
David L Parkhurst
31c1ae8664 Optimizing activity update
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6855 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-08-05 18:04:34 +00:00
David L Parkhurst
b0b007ca92 const static vopts
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6793 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-17 17:12:50 +00:00
David L Parkhurst
a826fa57fd Added Update method, removed unused prototypes.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6790 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-16 22:20:03 +00:00
David L Parkhurst
f069c8e57d renamed c files.
updated project.

moved PHAST_IPhreeqc to IPhreeqcPhast

removed const from StorageBin getters.

Fixed some compile errors.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6776 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-12 22:10:02 +00:00
David L Parkhurst
0ca9654356 Reversed logic to NO_STATIC_VOPTS, default is now static vopts. No changes to Makefile or project needed now.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6771 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-11 16:39:13 +00:00
David L Parkhurst
8823f0ff2f Added STATIC_VOPTS to make vopts static, not static unless defined.
Guy had problems with static variables with OpenMP.

Also removed other static variables fpunchf_user s_warning and buffer, spread length, utilities spinner. Put in Phreeqc.h.

Removed static fnbuf from Pbasic.cpp, put in Pbasic.h.

I think only static variables are in Keywords.h and are necessary for initialization.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6770 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-07-11 16:23:02 +00:00
David L Parkhurst
fc2d4425fb Added SOLUTION_MIX m-n keyword that mixes solutions without doing a full reaction calculation.
Results of mix are stored as SOLUTION m-n.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6665 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-06-13 23:15:49 +00:00
David L Parkhurst
3d2e4ae4be Removed Phreeqc_class.h.
Replaced all PHREEQC_PTR, P_INSTANCE, p_instance1.

Now uses Phreeqc * phreeqc_ptr for Phreeqc cookies.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6509 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-04-19 18:35:14 +00:00
Scott R Charlton
fd26a7edb1 fixed memory leak caused by duplicate numbered solutions (see ex12 -- solution 0) (previous fix was just a band-aid)
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6271 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-03-07 05:43:33 +00:00
David L Parkhurst
91f650a5e9 Merged ErrorHandling 6119-6268 changes.
All reactant structs have been removed.
Tony's pressure uses mu in pressure term of log_k.
Test cases run, discriminant check at 1e-8.

Still want to optimize out some k_temp calls and checks for same T, P, mu.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6269 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-03-06 23:42:49 +00:00
David L Parkhurst
7683982877 changed all double to LDBLE
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6038 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-11 21:13:51 +00:00
David L Parkhurst
4f0fb6c928 Finished ss_assemblage rename.
Added Use class

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6020 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 20:11:15 +00:00
David L Parkhurst
f085546091 Renaming SSassemblageSS
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@6018 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-10 19:10:05 +00:00
David L Parkhurst
acf62c7881 gas_phase and irrev removed.
get_line moved to PHRQ_io.

Still debugging some.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2012-01-04 16:07:40 +00:00
David L Parkhurst
95aa3278de Removed phrqproto.h from project and svn deleted.
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5718 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-20 23:53:44 +00:00
David L Parkhurst
be8d41f2a9 removed MERGE_INCLUDE_FILES
some static and extern
unused static maps

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5717 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-20 23:50:11 +00:00
David L Parkhurst
7e26eec197 Last checkin svn deleted obsolete files output.h, output.cpp, phreeqc_files, main.cpp.
removed all PHREEQC_CLASS ifdefs

Need to remove old_io ifdefs

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5712 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-20 21:14:33 +00:00
David L Parkhurst
601d8515b8 Removed PHREEQC_CPP and some PHREEQC_CLASS.
Will continue to remove PHREEQC_CLASS.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5711 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-20 20:06:32 +00:00
David L Parkhurst
ee9dcce40b writing cxxStorageBin2phreeqc.
clean up some consts.

Adding methods for Mix, Reaction, Temperature.

Need parallel method for exchange_ptr_to_user for mix, irrev, temperature.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5689 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-15 00:40:56 +00:00
David L Parkhurst
03dcbf8eee Added Simplify_totals method and
Update method to aid in PHAST implementation.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5687 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-13 22:37:06 +00:00
David L Parkhurst
7ccdb1613b removed dead code, mostly P_INSTANCE and PHREEQC_PTR
git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5681 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2011-10-05 19:32:29 +00:00