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

Shrink array for SIT

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9648 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-05-13 20:42:47 +00:00
parent b157d11a46
commit 51db3a1569
3 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
model.cpp
View File

@ -1672,8 +1672,31 @@ ineq(int in_kode)
{
output_msg(sformatf( "k, l, m\t%d\t%d\t%d\n", k, l, m));
}
#define SHRINK_ARRAY
#ifdef SHRINK_ARRAY
if (sit_model && full_pitzer == FALSE)
{
n = count_unknowns - (int) s_list.size();
for (int i = 0; i < l_count_rows; i++)
{
//for (int j = 0; j < n; j++)
//{
// ineq_array[i*(n+2) + j] = ineq_array[i*(count_unknowns+2) +j];
//}
if (i > 0)
{
memcpy((void *) &ineq_array[i*(n+2)], (void *) &ineq_array[i*(count_unknowns+2)], (size_t) (n) * sizeof(LDBLE));
}
ineq_array[i*(n+2) + n] = ineq_array[i*(count_unknowns+2) + count_unknowns];
}
}
else
{
n = count_unknowns; /* columns in A, C, E */
}
#else
n = count_unknowns; /* columns in A, C, E */
#endif
l_klmd = max_row_count - 2;
l_nklmd = n + l_klmd;
l_n2d = n + 2;
@ -1687,7 +1710,7 @@ ineq(int in_kode)
{
l_kode = 1;
}
l_iter = 2*(count_unknowns + l_count_rows);
l_iter = 2*(n + l_count_rows);
/*
* Allocate space for arrays
*/
@ -1787,10 +1810,13 @@ ineq(int in_kode)
}
#endif
/* Copy delta1 into delta and scale */
memcpy((void *) &(delta[0]), (void *) &(delta1[0]),
#ifdef SHRINK_ARRAY
memcpy((void *) &(delta[0]), (void *) &(zero[0]),
(size_t) count_unknowns * sizeof(LDBLE));
for (i = 0; i < count_unknowns; i++)
#endif
memcpy((void *) &(delta[0]), (void *) &(delta1[0]),
(size_t) n * sizeof(LDBLE));
for (i = 0; i < n; i++)
delta[i] *= normal[i];
/*
* Rescale columns of array

3
pitzer.cpp
View File

@ -2034,7 +2034,8 @@ model_pz(void)
count_infeasible));
log_msg(sformatf( "Number of basis changes: %d\n\n",
count_basis_change));
log_msg(sformatf( "Number of iterations: %d\n\n", iterations));
log_msg(sformatf( "Number of iterations: %d\n", iterations));
log_msg(sformatf( "Number of gamma iterations: %d\n\n", gamma_iterations));
debug_model = debug_model_save;
set_forward_output_to_log(FALSE);
if (stop_program == TRUE)

3
sit.cpp
View File

@ -1379,7 +1379,8 @@ model_sit(void)
count_infeasible));
log_msg(sformatf( "Number of basis changes: %d\n\n",
count_basis_change));
log_msg(sformatf( "Number of iterations: %d\n\n", iterations));
log_msg(sformatf( "Number of iterations: %d\n", iterations));
log_msg(sformatf( "Number of gamma iterations: %d\n\n", gamma_iterations));
debug_model = debug_model_save;
set_forward_output_to_log(FALSE);
if (stop_program == TRUE)