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

Merge commit 'aab8bc12ea8be8aec5943e1c77a54b19d28168cb'

Browse Source
This commit is contained in:
Darth Vader 2020-01-27 02:03:24 +00:00
commit efbddbf6dc
1 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
phreeqcpp/readtr.cpp
View File

@ -744,8 +744,8 @@ read_transport(void)
max_cells = count_length; max_cells = count_length;
if (count_disp > max_cells) if (count_disp > max_cells)
max_cells = count_disp; max_cells = count_disp;
//if (count_por > max_cells) if (count_por > max_cells * (1 + stag_data->count_stag))
// max_cells = count_por; max_cells = (int)ceil(((double)count_por / (double)(1 + stag_data->count_stag)));
if (max_cells > count_cells) if (max_cells > count_cells)
{ {
if (max_cells == count_length) if (max_cells == count_length)
@ -762,13 +762,13 @@ read_transport(void)
count_disp); count_disp);
warning_msg(token); warning_msg(token);
} }
//else else
//{ {
// sprintf(token, sprintf(token,
// "Number of cells is increased to number of porosities %d.", "Number of mobile cells is increased to (ceil)(number of porosities) / (1 + number of stagnant zones) = %d.",
// count_por); (int) ceil(((double)count_por / (double)(1 + stag_data->count_stag))));
// warning_msg(token); warning_msg(token);
//} }
} }
/* /*
* Allocate space for cell_data * Allocate space for cell_data
@ -901,18 +901,31 @@ read_transport(void)
else else
{ {
for (i = 1; i <= count_por; i++) for (i = 1; i <= count_por; i++)
cell_data[i].por = pors[i - 1];
if (all_cells > count_por)
{ {
if (i == max_cells + 1)
continue;
cell_data[i].por = pors[i - 1];
}
if (all_cells - 2 > count_por)
{
int st = stag_data->count_stag ? 1 : 0;
error_string = sformatf( error_string = sformatf(
"Porosities were read for %d cells. Last value is used till cell %d.", "Porosities were read for %d cells. Last value is used till cell %d.",
count_por, all_cells - 1); count_por, all_cells - st);
warning_msg(error_string); warning_msg(error_string);
for (i = count_por; i < all_cells; i++) for (i = count_por; i < all_cells - st; i++)
{
if (i == max_cells)
continue;
assert((i+1) < all_cells);
if ((i+1) < all_cells)
{
cell_data[i + 1].por = pors[count_por - 1]; cell_data[i + 1].por = pors[count_por - 1];
} }
} }
} }
}
}
if (interlayer_Dflag && !multi_Dflag) if (interlayer_Dflag && !multi_Dflag)
{ {
input_error++; input_error++;