max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 16:44:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added METHOD_REGISTERBASICCALLBACK for MPI.

Browse Source 
CALL register_basic_callback_fortran() in InitializeRM
CALL register_basic_callback_fortran() in mpi_methods
phast_manager my_basic_fortran_callback and register_basic_callback_fortran
PBasic defined tokcell_pore_volume, tokcell_volume, tokcell_porosity, and tokcell_saturation

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9457 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-04-02 19:07:59 +00:00
parent b255de1643
commit 76e16420f5
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
PBasic.cpp
View File

@ -3297,6 +3297,10 @@ factor(struct LOC_exec * LINK)
case tokcell_pore_volume:
case tokporevolume:
{
double x1 = (double) PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "cell_pore_volume");
}
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->cell_pore_volume;
break;
@ -3306,13 +3310,24 @@ factor(struct LOC_exec * LINK)
break;
/* VP: Density End */
case tokcell_volume:
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->cell_volume;
{
double x1 = (double) PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "cell_volume");
}
break;
case tokcell_porosity:
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->cell_porosity;
{
double x1 = (double) PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "cell_porosity");
}
//n.UU.val = (parse_all) ? 1 : PhreeqcPtr->cell_porosity;
break;
case tokcell_saturation:
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->cell_saturation;
{
double x1 = (double) PhreeqcPtr->solution_number();
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->basic_callback(x1, x1, "cell_saturation");
}
//n.UU.val = (parse_all) ? 1 : PhreeqcPtr->cell_saturation;
break;
case toksc:
n.UU.val = (parse_all) ? 1 : PhreeqcPtr->calc_SC();