2086 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Andreas Lauser	5bf53148c0	replace #if HAVE_CONFIG_H by #ifdef HAVE_CONFIG_H ... it seems like most build systems pass a -DHAVE_CONFIG_H flag to the compiler which still causes `#if HAVE_CONFIG_H` to be false while it clearly is supposed to be triggered. That said, I do not really see a good reason why the inclusion of the `config.h` file should be guarded in the first place: the file is guaranteed to always available by proper build systems, and if it was not included the build either breaks at the linking stage or -- at the very least -- the runtime behavior of the resulting libraries will be very awkward.	2017-12-11 11:33:52 +01:00
Andreas Lauser	db1f257184	make call_umfpack.c compile even if UMFPACK is not available ... That said, don't try to call any of its functions or you'll regret it at runtime!	2017-12-11 11:33:52 +01:00
Andreas Lauser	503c7d1ca8	make the PETSc code compile even if PETSc is not available ... if PETSc is not available, the .cpp file will compile fine because it will be reduced to be empty, but trying to include LinearSolverPetsc.hpp in this case will result in an error.	2017-12-11 11:33:52 +01:00
Andreas Lauser	244871829d	PhaseUsage: handle polymer and solvent the same way as energy	2017-12-11 10:30:14 +01:00
Andreas Lauser	4571a8f841	add an energy "phase" ... This is quite a hack: Even though energy is not a "phase" and it is also not considered in MaxNumPhases and pu.num_phases because this would break a lot of assumptions in old code, it is nevertheless assigned an "canonical index" that can be translated "active index" via PhaseUsage::phase_pos[]. This awkwardness is needed because much of the legacy OPM code conflates the concepts of "fluid phase" and "conserved quantity" and fixing that issue would basically mean an almost complete rewrite of much of the legacy code. That said, the same statement applies to polymer and solvent, but these are currently handled as even more second-class citizens because they are not even given a canonical index and also cannot be translated into an active one.	2017-12-11 10:30:14 +01:00
Arne Morten Kvarving	075d518bea	fixed: add ENERGY to switch to quell unhandled enum value warning	2017-12-05 17:13:08 +01:00
Tor Harald Sandve	31657a5d1c	Add efficiencyFactor to GuideRate	2017-12-01 11:32:35 +01:00
Tor Harald Sandve	c787f5a251	Handle WEFAC ... Added test combining WEFAC and GEFAC	2017-11-30 13:45:05 +01:00
Tor Harald Sandve	90fcf0b132	Fix pvtIndex map for cases with non-active eqlnum regions.	2017-11-27 13:40:09 +01:00
Tor Harald Sandve	85aa6d41cc	Adress PR review issues 2	2017-11-24 10:52:57 +01:00
Tor Harald Sandve	6862ed0b35	Fix 2p bug	2017-11-22 09:24:52 +01:00
Tor Harald Sandve	197019d865	Adress PR review issues	2017-11-22 08:31:57 +01:00
Tor Harald Sandve	5bb7bc1185	Remove the usage of partition_unif_idx() from opm-core	2017-11-21 15:01:52 +01:00
Tor Harald Sandve	d6ea5cc402	Cleaning the initialization code ... -remove whitespaces -fix documentation	2017-11-21 12:52:07 +01:00
Tor Harald Sandve	0ef82665f5	Use &ref not shared_pointer to MaterialLawManager	2017-11-21 12:08:10 +01:00
Tor Harald Sandve	51f48fcd13	Remove blackoilPhases and phaseUsage from the initialization code ... Note 1: The initialization code now always consider 3 phases. For 2-phase cases a trivial (0) state is returned. Note 2: The initialization code does not compute a BlackoilStats, but instead pass the initialization object with the initial state.	2017-11-21 12:08:10 +01:00
Tor Harald Sandve	36e8f1bfec	Remove BlackoilProps from equil initalization code ... Use FluidSystem and materialLaw from opm-material directly not via the BlackoilProps in opm-core	2017-11-21 12:08:10 +01:00
Atgeirr Flø Rasmussen	91ac16b7e3	Merge pull request #1184 from akva2/remove_unused_sources ... remove unused code	2017-11-15 14:09:31 +01:00
Arne Morten Kvarving	a76ae214b8	remove unused code	2017-11-15 11:56:40 +01:00
Atgeirr Flø Rasmussen	f29f1b49d1	Merge pull request #1122 from atgeirr/fix-type-bug-in-equil ... Fix type bug in equil	2017-11-14 14:40:47 +01:00
Joakim Hove	19318e5019	Schedule no longer part of EclipseState.	2017-10-24 20:38:15 +02:00
Atgeirr Flø Rasmussen	9021571c05	Update swatinit tests to account for bugfix.	2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen	8779937d3d	Update equil regression reference after bugfix. ... Also reduce some very coarse tolerances to more reasonable levels.	2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen	3bfe295d62	Bugfix: type for target capillary pressure.	2017-10-12 14:27:32 +02:00
Atgeirr Flø Rasmussen	bbfd5b6413	Merge pull request #1180 from blattms/cleanup-version-ifs ... [cleanup] Removes unnecessary if clauses for unsupported DUNE versions.	2017-10-12 13:28:50 +02:00
Atgeirr Flø Rasmussen	df59dbbabf	Merge pull request #1177 from alfbr/master ... Removing redundant checks from Nexus	2017-10-11 21:57:36 +02:00
Markus Blatt	2bdafdb602	[cleanup] Removes unnecessary if clauses for unsupported DUNE versions. ... We are targetting DUNE 2.4.* and 2.5.* currently. Therefore this commit removes the if checks for lower versions to cleanup the code.	2017-10-11 21:25:18 +02:00
Alf B. Rustad	fa886bc3aa	Cosmetic change	2017-10-11 10:45:18 +02:00
Alf B. Rustad	7d32729a00	Cosmetic change	2017-10-11 10:45:18 +02:00
Alf B. Rustad	db7c47042c	Remove remaining Nexus checks	2017-10-11 10:45:17 +02:00
Alf B. Rustad	520574513f	Avoid false positives by introducing a tolerance	2017-10-11 10:45:17 +02:00
Alf B. Rustad	cc3ab456e9	Removing redundant checks from Nexus	2017-10-11 10:44:59 +02:00
Tor Harald Sandve	4b123f839a	Update the swatinit test base on fix in opm-material#248	2017-10-11 09:39:12 +02:00
Andreas Lauser	d95b622c75	mark initHydroCarbonState() as inline ... this allows it to be used in multiple compile units without the linker running amok.	2017-10-04 19:24:20 +02:00
Joakim Hove	b6b2f12142	Updated NNC() constructor.	2017-09-26 14:30:50 +02:00
Tor Harald Sandve	d643476ea5	Fix fallout if no group controll (NONE) is specified for a group	2017-08-18 08:56:26 +02:00
Tor Harald Sandve	6b55b8316b	Add interface for passing cell pressures directly in wellState.init(...)	2017-08-03 10:31:10 +02:00
Tor Harald Sandve	d247b05b6b	Add polymer to phase usage.	2017-06-16 13:40:29 +02:00
Tor Harald Sandve	655b81c8d7	Add polymer to blackoilstate	2017-06-12 15:37:57 +02:00
Atgeirr Flø Rasmussen	8a2cf4fd2d	Merge pull request #1167 from GitPaean/fixing_petsc_compilation ... removing the unused parameter:: for LinearSolverPetsc	2017-06-12 11:12:45 +02:00
Robert Kloefkorn	02b0b9d0f9	[cleanup] remove two uninitialized warnings in SaturationProposFromDeck.	2017-06-07 13:19:21 +02:00
Kai Bao	bbb0c5a993	removing the unused parameter:: for LinearSolverPetsc ... to fix the compilation when PETsc exists.	2017-06-06 11:00:51 +02:00
Markus Blatt	1b52fc0724	Add missing include of config.h ... Closes OPM/opm-core#1164	2017-05-24 12:11:49 +02:00
Tor Harald Sandve	d7fa66197f	Add SSOL to blackoilState ... Stores the solvent saturation in the simulator container.	2017-05-10 11:14:53 +02:00
Tor Harald Sandve	9e504da6a1	Add solvent to phaseUsage	2017-05-08 10:29:51 +02:00
Arne Morten Kvarving	ca2288ac37	changed: remove embedded 'parameters' namespace in ParamGroup ... inconsistent and unnecessary. this is purely a cosmetic change, the only exception was a function with the generic name 'split', which was renamed to splitParam to avoid confusion.	2017-04-28 15:34:11 +02:00
Atgeirr Flø Rasmussen	ce6801df7a	Merge pull request #1157 from andlaus/fix-non-MPI-build ... fix non-MPI builds	2017-04-20 21:47:08 +02:00
Andreas Lauser	6f257f0877	fix non-MPI builds ... some headers must be included unconditionally.	2017-04-20 15:12:34 +02:00
Tor Harald Sandve	9a1a26b267	FIX memory leakage in well_controls ... The Alq and vfp is set free in well_controls_destroy to avoid memory leakage.	2017-04-20 12:58:16 +02:00
Kai Bao	926f93fa4e	adding flag to tell when using well potential for guide rate ... for WellNode.	2017-04-11 16:53:19 +02:00