Commit Graph

54 Commits

Author SHA1 Message Date
Joakim Hove
dc9ba1dc56 Minor white space cleanup 2020-05-05 19:13:32 +02:00
Joakim Hove
315382bad8 Run PYACTION keywords
The PYACTION keyword is implemented with a Python module with a run() function
in an external module.
2020-04-16 14:13:54 +02:00
Joakim Hove
466e21e37e Add api for PyAction::run() 2020-04-13 08:01:09 +02:00
Joakim Hove
611b21beab Add serialization active member 2020-03-24 08:40:13 +01:00
Joakim Hove
9ce64d5aae Add copy constructor and assignment operator to PyAction 2020-03-24 08:07:21 +01:00
Joakim Hove
a0ebb2091f Add method Actions::pending_python() to get active Python functions 2020-03-24 07:23:31 +01:00
Joakim Hove
4c25ce69c1 Add mutable bool active member to PyAction 2020-03-24 07:23:31 +01:00
Arne Morten Kvarving
e3bd1e6723 add static method to return a test object for serialization
this allows killing the constructors taking member values
2020-03-23 10:58:15 +01:00
Joakim Hove
81b70de140 Add serializer support for PyAction 2020-03-20 17:15:53 +01:00
Joakim Hove
9632eae663 Add PyAction container to Actions class 2020-03-20 16:59:50 +01:00
Joakim Hove
d06a5a78e0 Moved PyAction class into Action:: namespace 2020-03-20 16:59:50 +01:00
Joakim Hove
7852203d39 PYACTION: The actual python code is in an external file
With this commit the PYACTION keyword is changed, instead of embedding the
Python code directly in the .DATA file the keyword now points to an external
file which is loaded verbatim into the PyAction keyword.

In addition the PYACTION keyword has now got a name and a string indicating how
many times it should run.
2020-03-20 16:59:50 +01:00
Arne Morten Kvarving
6519429291 remove accessors in Actions added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
91d62c63a1 add serialization template to Actions 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
f8cb4a80ff remove accessors in ActionAST added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
9cd1403b33 add serialization template to ActionAST 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
8ad0111ded remove accessors in ActionX added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
e0a02e893a add serialization template to ActionX 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
3ea3fb4f8f add serialization template to Action::Condition 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
aa33b4c7c1 add serialization template to Action::Quantity 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
5abfb155fb remove accessors in ASTNode added for external serialization 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
dc142f9f43 add serialization template to ASTNode 2020-03-19 09:34:12 +01:00
Arne Morten Kvarving
eb1e71b625 add serialization template to Actdims 2020-03-17 08:28:18 +01:00
Joakim Hove
a6ddce5d92 Add basic Python exec of PYACTION 2020-01-13 15:15:21 +01:00
Joakim Hove
d2392c4ea4 Add PyAction skeleton code 2020-01-06 10:28:19 +01:00
Arne Morten Kvarving
9d74b51024 make Action::Actions constructible from variables
also add accessor and equality operator
2020-01-03 13:20:36 +01:00
Arne Morten Kvarving
e0502a1970 make Action::ActionX constructible from variables
also make it default constructible, add accessors
and equality operator
2020-01-03 13:20:36 +01:00
Arne Morten Kvarving
24bfa2e75b add equality operator to Action::Condition
also make it default constructible
2020-01-03 13:20:36 +01:00
Arne Morten Kvarving
65b958cbcd add equality operator to Action::Quantity 2020-01-03 13:20:36 +01:00
Arne Morten Kvarving
e7e2458951 make Action::AST constructible from variables
also add accessors and equality operator
2020-01-03 13:20:36 +01:00
Arne Morten Kvarving
73001501f0 make ASTNode constructible from variables
also add accessors and equality operator
2020-01-03 08:34:28 +01:00
Arne Morten Kvarving
9c187ad0c1 changed: make ASTNode part of public API
required for serialization
2020-01-03 08:34:28 +01:00
Joakim Hove
7cfb51dfe6 Merge pull request #1195 from jalvestad/actionx-udq-rst
Code to write UDQ and ACTIONX data to the Eclipse compatible restart file
2019-12-19 10:27:51 +01:00
Arne Morten Kvarving
33e14dd3cf allow constructing Actdims from variables
also add equality operator
2019-12-18 09:17:12 +01:00
Jostein Alvestad
0c9a2cbbf6 initial changes to test output of UDQ and ACTIONX data to ecl-restart
change to avoid zero-size windows in Actionx

changes to improve Restart output content

change to correct IUDQ for DEFINE

corrections to IACN and SACN

initial changes to add item to ZWEL

further changes to add Action to well

further changes to allow for action name in ZWEL

more changes

further changes to output action name to ZWEL

changes to test/debug Restart write

turn on writing of ZWEL again

First running version of udq-actionx-rst

use Action::Result direkte

first working! version

some corrections

changes to allow for output of SACN [4.6.8]

added debug print

changes to improve IACN and IACT

further corrections to Actionx IACN pluss error messages

changes to adapt to well2 converted to well class

further changes to enable restart with group control

changes to adapt to newly merged code in master

changes to include Intehead [51] - group control

test

changes to iGrp[nwgmax +7]

initial changes for GUIDERATE

changes to add guiderate parameters to the restart file

add comment

correction to guiderate - test if exist

correction to DoubHead - test if GR exist

correction to ISEG[8]

correction for eclipse version Restart-file

Cosmetic change

corrections to igrp

correction to segment type in iseg
2019-12-17 12:30:40 +01:00
Joakim Hove
f33c4f749e Add copy constructor + contains() method to Action::Result 2019-11-04 12:54:14 +01:00
Joakim Hove
781ced7294 Use struct Location to record file position for keywords 2019-10-17 23:57:01 +02:00
Joakim Hove
2be6235ab7 Add small struct DeckKeyword::Location to simplify error reporting 2019-10-17 23:56:34 +02:00
Jostein Alvestad
7973585db0 Initial work to add Actionx data to Eclipse compatible restart file
further changes to Actionx - restart

further changes for Actionx data to Restart file

additional changes to output Actionx data to Restart file

add test data for UDQ-ACTIONX

changes to add unit tests for InteHead - Actionx

Added changes to allow for output of IACT, SACT and ZACT to the E100 compatible restart file

changes to add ZLACT to restart output

Further changes - add ZACN - prelim

further changes to add ZACN to restart file

Additional changes to output IACN and SACN to restart

further changes to add IACN and SACN to the restart file

further changes to make unit tests for Actionx data / keywords

further changes to actionx restart and unit tests therefore

Added code for unit tests - not finished

some changes to correct for changes in upstream/master

changes correct errors in IACN and SACN

Initial work to add Actionx data to Eclipse compatible restart file

further changes to Actionx - restart

further changes for Actionx data to Restart file

additional changes to output Actionx data to Restart file

add test data for UDQ-ACTIONX

changes to add unit tests for InteHead - Actionx

Added changes to allow for output of IACT, SACT and ZACT to the E100 compatible restart file

changes to add ZLACT to restart output

Further changes - add ZACN - prelim

further changes to add ZACN to restart file

Additional changes to output IACN and SACN to restart

further changes to add IACN and SACN to the restart file

further changes to make unit tests for Actionx data / keywords

further changes to actionx restart and unit tests therefore

Added code for unit tests - not finished

some changes to correct for changes in upstream/master

changes correct errors in IACN and SACN

changes to avoid change in output data for restart file

further changes to avoid change in RESTART data

minor change to avoid data change in Restart file
2019-10-14 15:45:24 +02:00
Joakim Hove
4078451840 Action::Condition has lhs and rhs member properties 2019-09-14 08:26:51 +02:00
Joakim Hove
8efe3cf6a6 Remove unused member Condition::expression 2019-09-13 19:24:53 +02:00
Joakim Hove
546cd46926 Add cmp_string() method to Action::Condition class 2019-09-13 19:22:02 +02:00
Joakim Hove
6683ac1be6 Accept <= and >= in the ActionX::Condition 2019-09-07 18:17:05 +02:00
Joakim Hove
af2a09bde5 Make sure actionx keywords can be redefined 2019-09-03 13:47:30 +02:00
Joakim Hove
2aa10a0435 Internalize ActionX conditions to enable restart 2019-09-03 13:47:30 +02:00
Joakim Hove
12a8656647 Changed Actions::at() to const 2019-09-03 13:46:02 +02:00
Joakim Hove
07b2f47c7d Add micro class to contain information from ACTDIMS keyword 2019-08-28 23:22:02 +02:00
Joakim Hove
359955efc3 Action: capture matching wells correctly + large refactor
With this commit the result of a ACTIONX evaluation goes to the new type
Action::Result which in addition to the overall thruthness of the expression
keeps track of the list of matching wells.

Introduced a new namespace Action for everything related to the ACTIONX
implemenentation.
2019-08-09 15:43:58 +02:00
Joakim Hove
27e1cc654a ActionContext uses a reference to SummaryState 2019-08-09 15:43:58 +02:00
Joakim Hove
2caf82baff Move check for legitimate keywords to ActionX 2019-02-03 18:07:04 +01:00