OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,132 Commits 9 Branches 35 Tags 15 MiB
ce38c8eee8
Commit Graph

1688 Commits

Author SHA1 Message Date
Andreas Lauser
88541d8762 make the saturation functions work with opm-parser 2014-02-10 14:50:37 +01:00
Joakim Hove
3e3542dabe Merge pull request #471 from andlaus/parser-integrate_grid_management 
add variants of all methods which take the new parser to the grid manager
 2014-02-10 13:35:25 +01:00
Joakim Hove
a8dc720a25 Merge pull request #469 from andlaus/parser-integrate_phase_usage_from_deck 
git add variant of phaseUsageFromDeck() which takes a deck of the new parser
 2014-02-10 13:30:39 +01:00
Andreas Lauser
099d6ee797 rename "createGrDecl" to "createGrdecl" 2014-02-07 19:35:28 +01:00
Andreas Lauser
71ab7bd335 add back blank line as requested by @bska 2014-02-07 19:35:28 +01:00
Andreas Lauser
96a7730d8c add variants of all methods which take the new parser to the grid manager 2014-02-07 19:35:28 +01:00
Andreas Lauser
2537ed0a0d git add variant of phaseUsageFromDeck() which takes a deck of the new parser 2014-02-07 19:35:28 +01:00
Joakim Hove
0b44f76333 Merge remote-tracking branch 'upstream/opm-parser-integrate' into opm-parser-integrate 2014-02-07 09:23:39 +01:00
Joakim Hove
1548346476 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-07 09:23:22 +01:00
Kristian Flikka
5cc903bbe0 Initializing do_hyst_ to false, this caused random segfaults in sim_fibo_ad 2014-02-06 21:17:36 +01:00
Kristian Flikka
8cdaf7d05d Removed WELOPEN from constructor, added throwing on non OPEN/SHUT statuses 2014-02-06 16:31:35 +01:00
Joakim Hove
e1f104ccdd Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-05 23:06:54 +01:00
Atgeirr Flø Rasmussen
45b080b5be Merge pull request #489 from atgeirr/fix-more-warnings 
Fix more warnings found by clang
 2014-02-05 18:26:57 +01:00
Atgeirr Flø Rasmussen
91c1131aff Merge pull request #487 from atgeirr/fix-warnings 
Fix some warnings
 2014-02-05 18:26:43 +01:00
Atgeirr Flø Rasmussen
d2e1eb8d02 Merge pull request #485 from atgeirr/fix-initial-call-eclipsewriter 
Fix SimulatorTimer-related bug in EclipseWriter.
 2014-02-05 18:25:29 +01:00
Atgeirr Flø Rasmussen
a9bcbd64db Fix unused argument warning and wrong behaviour. 
The class WarnAndContinueOnError should write warnings irrespective
of the status of the OPM_VERBOSE symbol.
 2014-02-05 15:07:17 +01:00
Atgeirr Flø Rasmussen
9396d8b3ed Fix unused argument warnings. 2014-02-05 15:04:56 +01:00
Atgeirr Flø Rasmussen
2250d7bb95 Suppressed some unused parameter warnings. 2014-02-05 14:46:22 +01:00
Atgeirr Flø Rasmussen
8ad4dd172f Moved explicit template instantiation inside namespace. 
Clang requires this to happen inside the namespace of the class
(which is in the anonymous namespace) and issues an error diagnostic.
 2014-02-05 14:44:58 +01:00
Atgeirr Flø Rasmussen
543230c8cf Suppress warnings in unimplemented functions. 
This prevents warnings from functions that are right now just
a throw statement. Also cleaned up a few whitespace issues nearby.
 2014-02-05 14:27:51 +01:00
Atgeirr Flø Rasmussen
708f9a2fa3 Fix initialisation warning. 2014-02-05 13:05:33 +01:00
Atgeirr Flø Rasmussen
a2b7f0a4e4 Fix SimulatorTimer-related bug in EclipseWriter. 
Since writeTimeStep() now gets called also before the first timestep is done,
the EclipseWellTotal::update() method was in error, always calling
SimulatorTimer::stepLengthTaken(). That method cannot be called if the
timer's currentStepNum() is 0, so that is checked for and intercepted.
The total rate in that case is of course zero.
 2014-02-05 11:28:40 +01:00
Joakim Hove
6c8cba9d19 Merged upstream/master 2014-02-04 21:42:07 +01:00
Kristian Flikka
74cb703238 Removed WELTARG commented code, moved wellperf_data into createWellsFromSpecs function 2014-02-03 09:22:28 +01:00
Kristian Flikka
57a779167b Extracted well controls setup to separate function 2014-02-03 09:07:58 +01:00
Kristian Flikka
d390dc2725 Extracted well specification and completion data setup to a function 2014-02-03 08:58:54 +01:00
Bård Skaflestad
1513712e6b Merge pull request #481 from atgeirr/fix-summary-output 
Fix summary output, now contains output for all steps.
 2014-01-31 11:49:58 -08:00
Atgeirr Flø Rasmussen
5ea54d7a4a Merge pull request #478 from osae/endscale 
Saturation table scaling and hysteresis.
 2014-01-31 05:48:56 -08:00
osae
a186c0fb9c Removed blanks from strings. 2014-01-31 14:35:35 +01:00
Atgeirr Flø Rasmussen
f1ae040aef Removed erroneous comment. 2014-01-31 14:07:30 +01:00
Joakim Hove
4a36a72cdb Using well->hasInjectionControl() to check whether a particular control is available. 2014-01-30 16:37:20 +01:00
Joakim Hove
af79c27b9e Implemented WCONPROD support from Parser::Schedule object. 2014-01-30 15:55:17 +01:00
Atgeirr Flø Rasmussen
9f253eb9ae Add summary output of bottom hole pressures. 2014-01-30 14:18:09 +01:00
Atgeirr Flø Rasmussen
445800f738 Fix summary output, now contains output for all steps. 
Previously, the summary output was rewritten for each step,
leaving only the last step's data in the summary data file.
 2014-01-30 11:36:31 +01:00
Joakim Hove
d176de0075 Merge remote-tracking branch 'upstream/opm-parser-integrate' into wellsmanager-rates 
Conflicts:
	opm/core/wells/WellsManager.cpp
 2014-01-30 09:50:09 +01:00
Joakim Hove
59bd79af58 Implemented well injector properties from opm-parser::Well. 2014-01-30 08:02:13 +01:00
Joakim Hove
827b7099bc Added namespace prefix to enum. 2014-01-30 08:00:45 +01:00
Kristian Flikka
fabcb45d4c Removed print statement 2014-01-29 12:30:03 +01:00
Kristian Flikka
bca4242da9 Updated COMPDAT i,j,k indices, and removed the old commented part 2014-01-29 11:58:14 +01:00
Kristian Flikka
b6afe67357 Compdat extraction from new CompletionXXX classes 2014-01-29 11:58:13 +01:00
Joakim Hove
bfbc62655d Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-01-29 11:02:21 +01:00
Joakim Hove
6d79bcda34 Merge remote-tracking branch 'upstream/master' into wellsmanager-rates 2014-01-29 11:01:14 +01:00
osae
f8696edd7b RV is back in business - a second attempt. 2014-01-29 08:56:07 +01:00
osae
841acacf78 RV is back in business. 2014-01-29 08:42:33 +01:00
Kristian Flikka
07feb6509d Updated Namespace of PhaseEnum from opm-parser 2014-01-28 21:11:51 +01:00
osae
fa470063ca Saturation table scaling and hysteresis. 
This commit implements some additional scaling keywords.  This includes
the ISWL-family that provide hysteresis behaviour via alternative
scaling of the tables.  The old parser has been somewhat extended for
testing purposes.  The commit also includes a slight refactoring of the
SatFunc-family where a new base class has been introduced.
 2014-01-28 16:36:55 +01:00
Atgeirr Flø Rasmussen
ad899fcc10 Now checks for missing TOPS or DEPTHZ in DXV etc. initialization. 2014-01-24 13:55:16 +01:00
Atgeirr Flø Rasmussen
e4e4968d90 Merge pull request #462 from totto82/wetgas 
Added pvt functionality for wetgas
 2014-01-24 04:36:51 -08:00
Joakim Hove
1148e6b86e WellType is determined from well->isProducer() instead of looking for WCONINJE / WCONPROD keywords. 2014-01-24 12:00:58 +01:00
Tor Harald Sandve
06fbc93fef Fixing comments 
The comment now currently say 1/Bg
 2014-01-24 10:14:33 +01:00