[bugfix] CpGrid does not yet work with use_local_perm.

This commit is contained in:
Robert Kloefkorn 2015-06-30 14:28:01 +02:00
parent 5b51a5b7b1
commit 34429b60f1

View File

@ -132,7 +132,7 @@ try
#endif #endif
// Write parameters used for later reference. (only if rank is zero) // Write parameters used for later reference. (only if rank is zero)
bool output_cout = ( mpi_rank == 0 ); const bool output_cout = ( mpi_rank == 0 );
if(output_cout) if(output_cout)
{ {
@ -323,7 +323,15 @@ try
bool use_gravity = (gravity[0] != 0.0 || gravity[1] != 0.0 || gravity[2] != 0.0); bool use_gravity = (gravity[0] != 0.0 || gravity[1] != 0.0 || gravity[2] != 0.0);
const double *grav = use_gravity ? &gravity[0] : 0; const double *grav = use_gravity ? &gravity[0] : 0;
#if USE_DUNE_CORNERPOINTGRID
if(output_cout)
{
std::cout << std::endl << "Warning: use of local perm is not yet implemented for CpGrid!" << std::endl << std::endl;
}
const bool use_local_perm = false;
#else
const bool use_local_perm = param.getDefault("use_local_perm", true); const bool use_local_perm = param.getDefault("use_local_perm", true);
#endif
DerivedGeology geoprops(grid, new_props, eclipseState, use_local_perm, grav); DerivedGeology geoprops(grid, new_props, eclipseState, use_local_perm, grav);
boost::any parallel_information; boost::any parallel_information;