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

changes req'd for multi_punch

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/branches/multi_punch@7974 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-27 21:36:03 +00:00
parent a99ef8b3a8
commit 32b9285dfa
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
inverse.cpp
View File

@ -2125,7 +2125,7 @@ punch_model_heading(struct inverse *inv_ptr)
{
std::string tok1(col_name[i]);
tok1.append("_max");
tok1.append("_min");
std::string tok2(col_name[i]);
tok2.append("_max");
@ -2278,15 +2278,15 @@ punch_model(struct inverse *inv_ptr)
*/
if (!current_selected_output->Get_high_precision())
{
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) (error / SCALE_EPSILON));
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) scaled_error);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) max_pct);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) (error / SCALE_EPSILON));
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) scaled_error);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) max_pct);
}
else
{
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) (error / SCALE_EPSILON));
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) scaled_error);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) max_pct);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) (error / SCALE_EPSILON));
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) scaled_error);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) max_pct);
}
/*
* write solution fractions
@ -2304,15 +2304,15 @@ punch_model(struct inverse *inv_ptr)
d3 = 0.0;
if (!current_selected_output->Get_high_precision())
{
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) d1);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) d2);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) d3);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) d1);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) d2);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) d3);
}
else
{
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) d1);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) d2);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) d3);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) d1);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) d2);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) d3);
}
}
/*
@ -2331,15 +2331,15 @@ punch_model(struct inverse *inv_ptr)
d3 = 0.0;
if (!current_selected_output->Get_high_precision())
{
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) d1);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) d2);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%15.4e\t", (double) d3);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) d1);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) d2);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%15.4e\t", (double) d3);
}
else
{
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) d1);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) d2);
fpunchf(inverse_heading_names[n_user_punch_index++].c_str(), "%20.12e\t", (double) d3);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) d1);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) d2);
fpunchf(trim(inverse_heading_names[n_user_punch_index++]).c_str(), "%20.12e\t", (double) d3);
}
}
punch_msg("\n");