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@7967 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2013-08-27 05:07:46 +00:00
parent 2c6f8c2284
commit a99ef8b3a8
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
inverse.cpp
View File

@ -2089,7 +2089,6 @@ punch_model_heading(struct inverse *inv_ptr)
current_selected_output = &(so_it->second);
if (pr.punch == FALSE ||
current_selected_output == NULL ||
current_selected_output->Get_punch_ostream() == NULL ||
!current_selected_output->Get_inverse() ||
!current_selected_output->Get_active())
continue;
@ -2268,7 +2267,6 @@ punch_model(struct inverse *inv_ptr)
current_selected_output = &(so_it->second);
if (pr.punch == FALSE ||
current_selected_output == NULL ||
current_selected_output->Get_punch_ostream() == NULL ||
!current_selected_output->Get_inverse() ||
!current_selected_output->Get_active())
continue;
@ -2280,15 +2278,15 @@ punch_model(struct inverse *inv_ptr)
*/
if (!current_selected_output->Get_high_precision())
{
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) (error / SCALE_EPSILON));
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) scaled_error);
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) max_pct);
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);
}
else
{
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) (error / SCALE_EPSILON));
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) scaled_error);
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) max_pct);
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);
}
/*
* write solution fractions
@ -2306,15 +2304,15 @@ punch_model(struct inverse *inv_ptr)
d3 = 0.0;
if (!current_selected_output->Get_high_precision())
{
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) d1);
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) d2);
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) d3);
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);
}
else
{
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) d1);
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) d2);
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) d3);
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);
}
}
/*
@ -2333,15 +2331,15 @@ punch_model(struct inverse *inv_ptr)
d3 = 0.0;
if (!current_selected_output->Get_high_precision())
{
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) d1);
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) d2);
fpunchf_user(n_user_punch_index++, "%15.4e\t", (double) d3);
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);
}
else
{
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) d1);
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) d2);
fpunchf_user(n_user_punch_index++, "%20.12e\t", (double) d3);
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);
}
}
punch_msg("\n");