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

Another try on porosities.

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@10804 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2016-02-03 21:42:14 +00:00
parent 7c77eda952
commit bde722c21e
1 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
readtr.cpp
View File

@ -792,7 +792,8 @@ read_transport(void)
error_string = sformatf(
"No porosities were read; used the minimal value %8.2e from -multi_D.", multi_Dpor);
warning_msg(error_string);
for (i = old_cells + 1; i < all_cells; i++)
//for (i = old_cells + 1; i < all_cells; i++)
for (i = old_cells; i < all_cells; i++)
cell_data[i].por = multi_Dpor;
}
}
@ -896,7 +897,37 @@ read_transport(void)
else if (simul_tr == 1)
for (i = 0; i < max_cells; i++)
cell_data[i].print = TRUE;
//#define OLD_POROSITY
#if defined(OLD_POROSITY)
/*
* Fill in porosities
*/
if (interlayer_Dflag && !multi_Dflag)
{
input_error++;
error_string = sformatf(
"-multi_D must be defined, when -interlayer_D true.");
error_msg(error_string, CONTINUE);
}
for (i = 0; i < max_cells; i++)
{
multi_Dpor = (multi_Dpor < 1e-10 ? 1e-10 : multi_Dpor); //Fix for Jenkins !!!!!!!!!!!!
//if (cell_data[i].por < 0)
{
cell_data[i].por = multi_Dpor; //Fix for Jenkins !!!!!!!!!!!!
}
interlayer_Dpor = (interlayer_Dpor < 1e-10 ? 1e-10 : interlayer_Dpor);
cell_data[i].por_il = interlayer_Dpor;
}
#endif
//{
// for (int i = 0; i < all_cells; i++)
// {
// std::cerr << i << " " << cell_data[i].por << std::endl;
// }
//}
/*
* Calculate dump_modulus
*/