4479 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arne Morten Kvarving	9e8093b2a3	rename some macros	2017-01-23 11:44:21 +01:00
Arne Morten Kvarving	e857c151d6	attempt to add some documentation	2017-01-23 10:42:09 +01:00
Joakim Hove	5798e3475c	Merge pull request #1032 from joakim-hove/increase-abs-dev ... Increased tolerances when running parallel tests.	2017-01-21 08:45:37 +01:00
Joakim Hove	07d90b5c8d	Increased tolerances when running parallel tests.	2017-01-21 08:44:23 +01:00
Atgeirr Flø Rasmussen	f01541ce80	Merge pull request #1033 from andlaus/update_dune.module ... update the dune.module file	2017-01-20 15:32:29 +01:00
Andreas Lauser	7d5c5f8acc	Merge pull request #1029 from totto82/bugfix_swatinit ... BUGFIX Pass solution from flowEbos to ebos initially	2017-01-20 15:02:50 +01:00
Andreas Lauser	e982ece15d	update the dune.module file	2017-01-20 13:30:20 +01:00
Tor Harald Sandve	ce2aa77cbd	BUGFIX Pass solution from flowEbos to ebos initially ... The initial solution in ebos and in flowebos are different in cases where swatinit is present. Pass the initial solution and recalculate the intensive quantities make sure that the flowEbos initial solution is used.	2017-01-19 09:18:55 +01:00
Atgeirr Flø Rasmussen	9840ddd261	Merge pull request #1028 from akva2/update_reference_data ... Update reference data	2017-01-18 14:01:50 +01:00
Atgeirr Flø Rasmussen	6d6546284c	Merge pull request #1021 from GitPaean/group_ebos ... Group controls for flow_ebos	2017-01-18 13:52:17 +01:00
Arne Morten Kvarving	ab66125297	make sure working tree is clean before execution	2017-01-18 11:42:34 +01:00
Arne Morten Kvarving	532faf8f72	rename script	2017-01-18 11:31:39 +01:00
Arne Morten Kvarving	6e84c85e42	allow relative paths to toolchain file	2017-01-18 10:48:35 +01:00
Kai Bao	31e7dec018	removing a few blank lines. ... and adding a assertion that bhp != 0 when calculating well potentials.	2017-01-17 15:33:45 +01:00
Arne Morten Kvarving	ea06f12d25	fixed: print correct command at end of update helper ... do not point user to deps/opm-data, use the user-supplied directory. also add missing ewoms hash to output, consistently use $WORKSPACE everywhere and correct variable used for spe3|spe9 in data update loop	2017-01-17 10:49:50 +01:00
Kai Bao	9e93ebcc64	check whether the group targets are converged.	2017-01-16 16:18:35 +01:00
Kai Bao	65a3fff6f2	moving computeWellPotentials to be earlier in assemble() ... in StandardWellsDense. solveWellEq then have access to the updated well potentials. does not change the result.	2017-01-16 16:18:35 +01:00
Kai Bao	01322b740e	fixing the mistakes in the code due to rebasing.	2017-01-16 16:18:35 +01:00
Kai Bao	a95977e716	making the group control works for StandardWellsDense	2017-01-16 16:18:35 +01:00
Kai Bao	b0e2bd9221	adding well perforation efficiency factor to StandardWellsDense ... And also calculateEfficiencyFactor to initialize the values.	2017-01-16 16:18:35 +01:00
Kai Bao	4b47fa52ca	adding well collection to StandardWellsDense ... to make StandardWellsDense have access to the group information.	2017-01-16 16:18:35 +01:00
Kai Bao	941689722f	adding functioin computeWellPotentials to StandardWellsDense	2017-01-16 16:18:35 +01:00
Kai Bao	92a4d8687f	adding bhp as a parameter of computeWellFlux in StandardWellsDense ... To make the function usable for computing well potentionals.	2017-01-16 16:18:35 +01:00
Atgeirr Flø Rasmussen	5955cb07ba	Merge pull request #1026 from andlaus/flow_ebos-sync-with-flow_legacy ... Flow ebos sync with flow legacy	2017-01-16 15:56:20 +01:00
Arne Morten Kvarving	0466d71d15	add option -o ... use this to pass a toolchain file to use	2017-01-16 14:25:06 +01:00
Arne Morten Kvarving	0472d99fc8	fixed: include all updated tests in commit message	2017-01-16 14:02:39 +01:00
Arne Morten Kvarving	1812bf240e	separate spe1 cases in data update ... spe11 for spe1 case 1 spe12 for spe1 case 2	2017-01-16 14:02:39 +01:00
Arne Morten Kvarving	69f84075f5	changed: default to use one build thread per core on system, not a hardcoded 4 ... relies on nproc being available	2017-01-16 14:02:38 +01:00
Andreas Lauser	ae38de70ef	flow_ebos: update the solution of the eWoms model from the reservoir state before each time step ... this is has become necessary by the recent SWATINIT changes and is needed to calculate the fluid-in-place consistently as well as for ebos to use the correct initial solution for the initial linearization.	2017-01-16 12:42:35 +01:00
Andreas Lauser	30e9d3826d	synchronize SimulatorFullyImplicitBlackoilEbos::run() with SimulatorFullyImplicitBlackoil::run()	2017-01-16 12:42:35 +01:00
Andreas Lauser	d87b788d09	BlackoilModelEbos: make computeFluidInPlace() work unconditionally ... i.e. it now works regardless of whether the cache for intensive quatities is available or not.	2017-01-16 12:42:35 +01:00
Arne Morten Kvarving	f43bac8efa	some cosmetic updates ... - remove whitespace at eol - add function parameter documentation	2017-01-16 11:46:32 +01:00
Atgeirr Flø Rasmussen	7b17c7f1b6	Merge pull request #1024 from atgeirr/accept-missing-dims-keyword ... Warn instead of throw when missing DIMS keyword.	2017-01-16 08:56:51 +01:00
babrodtk	9b91e2f20b	Added script to update opm-data references	2017-01-16 08:06:26 +01:00
Atgeirr Flø Rasmussen	1d918453c9	Warn instead of throw when missing DIMS keyword. ... Default values will be used for parsing.	2017-01-13 11:07:02 +01:00
Atgeirr Flø Rasmussen	8534b82c2e	Merge pull request #1022 from atgeirr/silence-warning ... Silence unused argument warning.	2017-01-13 09:26:46 +01:00
Atgeirr Flø Rasmussen	bc35b753b5	Merge pull request #1003 from blattms/merge-only-created-parallel-files ... Only try to merge files from a parallel run if ouptput requested.	2017-01-12 17:00:12 +01:00
Atgeirr Flø Rasmussen	6ea858b6b9	Silence unused argument warning.	2017-01-12 15:35:13 +01:00
Atgeirr Flø Rasmussen	af3049b5a6	Merge pull request #1016 from andlaus/flow_ebos-remove-redundant-gravity ... flow_ebos: remove the redundant gravity objects	2017-01-12 12:19:19 +01:00
Andreas Lauser	7a7ebc010f	flow_ebos: remove the redundant gravity objects ... the canonical source is now the EclProblem object. v2: don't change the API of the DerivedGeology class. thanks to [at]atgeirr for noticing that this can be avoided.	2017-01-12 11:20:02 +01:00
Atgeirr Flø Rasmussen	0028b35e03	Merge pull request #1018 from andlaus/simplify_isParallel ... simplify BlackoilModelEbos::isParallel()	2017-01-12 10:41:15 +01:00
Tor Harald Sandve	28bbe20344	Merge pull request #1012 from andlaus/cleanup_StandardWellsDense ... small improvements to StandardWellsDense	2017-01-12 10:27:18 +01:00
Atgeirr Flø Rasmussen	af2c9a8200	Merge pull request #1015 from andlaus/flow_ebos-remove-redundancy ... FlowMainEbos: remove the redundant pointer to the MaterialLawManager	2017-01-12 10:25:47 +01:00
Atgeirr Flø Rasmussen	eb8132453f	Merge pull request #1017 from andlaus/remove_allcells ... SimulatorFullyImplicitBlackoilEbos: remove unused "allcells_" attribute	2017-01-12 09:59:41 +01:00
Atgeirr Flø Rasmussen	1406f7cf16	Merge pull request #1013 from andlaus/flow_ebos-no-SolutionState ... BlackoilModelEbos: remove the last traces of "SolutionState"	2017-01-12 09:27:13 +01:00
Andreas Lauser	3a9146866a	simplify BlackoilModelEbos::isParallel()	2017-01-11 18:57:47 +01:00
Andreas Lauser	f808c5b681	SimulatorFullyImplicitBlackoilEbos: remove unused "allcells_" attribute	2017-01-11 18:53:06 +01:00
Andreas Lauser	8c76bf5b9b	FlowMainEbos: remove the redundant pointer to the MaterialLawManager	2017-01-11 17:16:46 +01:00
Andreas Lauser	f2115b44ac	BlackoilModelEbos: remove the last traces of "SolutionState" ... it was not used for real for a while anyway.	2017-01-11 17:07:08 +01:00
Andreas Lauser	b324d17003	small improvements to StandardWellsDense ... the most significant change is that only a "PhaseUsage" object must be passed to its constructor instead of a full "fluid object". also, the pointers to the vector of "active" phases has been converted into a full object. (this helps to avoid potential use-after-free errors.)	2017-01-11 17:02:20 +01:00