Skip to content

Commit 7887d8c

Browse files
committed
Fix warnings
1 parent 4d4b53d commit 7887d8c

File tree

10 files changed

+32
-99
lines changed

10 files changed

+32
-99
lines changed

pipt/loop/assimilation.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,6 @@ class Assimilate:
4141
def __init__(self, ensemble: Ensemble):
4242
"""
4343
Initialize by passing the PIPT init. file up the hierarchy.
44-
45-
Parameters
46-
----------
47-
init_file : str
48-
PIPT init. filename
4944
"""
5045
# Internalize ensemble and simulator class instances
5146
self.ensemble = ensemble
@@ -442,11 +437,6 @@ def calc_forecast(self):
442437
> check_sim_end
443438
> get_sim_results
444439
445-
Parameters
446-
----------
447-
assim_step : int
448-
Current assimilation step.
449-
450440
Notes
451441
-----
452442
Parallel run in "ampersand" mode means that it will be started in the background and run independently of the

pipt/misc_tools/analysis_tools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1327,7 +1327,7 @@ def resample_state(aug_state, state, list_state, new_en_size):
13271327
13281328
Parameters
13291329
----------
1330-
aug_upd_state : ndarray
1330+
aug_state : ndarray
13311331
Augmented matrix of state variables
13321332
state : dict
13331333
Dict. af state variables

pipt/update_schemes/enkf.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ def __init__(self, keys_da, keys_fwd, sim):
2727
"""
2828
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
2929
`pipt.input_output.pipt_init.ReadInitFile`.
30-
31-
Parameters
32-
----------
33-
init_file : str
34-
PIPT init. file containing info. to run the inversion algorithm
35-
3630
"""
3731
# Pass the init_file upwards in the hierarchy
3832
super().__init__(keys_da, keys_fwd, sim)

pipt/update_schemes/enrml.py

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,6 @@ def __init__(self, keys_da, keys_fwd, sim):
5050
"""
5151
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
5252
`pipt.input_output.pipt_init.ReadInitFile`.
53-
54-
Parameters
55-
----------
56-
init_file : str
57-
PIPT init. file containing info. to run the inversion algorithm
5853
"""
5954
# Pass the init_file upwards in the hierarchy
6055
super().__init__(keys_da, keys_fwd, sim)
@@ -310,11 +305,6 @@ def __init__(self, keys_da, keys_fwd, sim):
310305
"""
311306
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
312307
`pipt.input_output.pipt_init.ReadInitFile`.
313-
314-
Parameters
315-
----------
316-
init_file : str
317-
PIPT init. file containing info. to run the inversion algorithm
318308
"""
319309
# Pass the init_file upwards in the hierarchy
320310
super().__init__(keys_da, keys_fwd, sim)
@@ -668,11 +658,6 @@ def __init__(self, keys_da):
668658
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
669659
`pipt.input_output.pipt_init.ReadInitFile`.
670660
671-
Parameters
672-
----------
673-
init_file : str
674-
PIPT init. file containing info. to run the inversion algorithm
675-
676661
References
677662
----------
678663
[1] Chen Y. & Oliver D.S. 2013, Levenberg-Marquardt Forms of the Iterative Ensemble Smoother for Efficient
@@ -685,7 +670,7 @@ def calc_analysis(self):
685670
"""
686671
Calculate the update step in approximate LM-EnRML code.
687672
688-
Parameters
673+
Attributes
689674
----------
690675
iteration : int
691676
Iteration number
@@ -822,11 +807,6 @@ def __init__(self, keys_da):
822807
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
823808
`pipt.input_output.pipt_init.ReadInitFile`.
824809
825-
Parameters
826-
----------
827-
init_file : str
828-
PIPT init. file containing info. to run the inversion algorithm
829-
830810
References
831811
----------
832812
[1] Raanes, P. N., Stordal, A. S., & Evensen, G. (2019). Revising the stochastic iterative ensemble smoother.
@@ -1005,17 +985,6 @@ def check_convergence(self):
1005985
Check if GN-EnRML have converged based on evaluation of change sizes of objective function, state and damping
1006986
parameter. Very similar to original function, but exit if there is no reduction in obj. function.
1007987
1008-
Parameters
1009-
----------
1010-
prev_data_misfit : float
1011-
Data misfit calculated from the previous update.
1012-
1013-
step : float
1014-
Step size.
1015-
1016-
lam : float
1017-
LM damping parameter.
1018-
1019988
Returns
1020989
-------
1021990
conv : bool

pipt/update_schemes/es.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ def __init__(self, keys_da, keys_fwd, sim):
2525
"""
2626
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
2727
`pipt.input_output.pipt_init.ReadInitFile`.
28-
29-
Parameters
30-
----------
31-
init_file : str
32-
PIPT init. file containing info. to run the inversion algorithm
3328
"""
3429
# Pass init. file to Simultaneous parent class (Python searches parent classes from left to right).
3530
super().__init__(keys_da, keys_fwd, sim)

pipt/update_schemes/esmda.py

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ def calc_analysis(self):
8686
covariance matrix is inflated with an inflation parameter alpha. The update is done as an iterative smoother
8787
where all data is assimilated at once.
8888
89-
Parameters
90-
----------
91-
assim_step : int
92-
Current assimilation step
93-
9489
Notes
9590
-----
9691
ES-MDA is an iterative ensemble smoother with a predefined number of iterations, where the updates is done with
@@ -343,11 +338,6 @@ def __init__(self, keys_da):
343338
The class is initialized by passing the PIPT init. file upwards in the hierarchy to be read and parsed in
344339
`pipt.input_output.pipt_init.ReadInitFile`.
345340
346-
Parameters
347-
----------
348-
init_file : str
349-
PIPT init. file containing info. to run the inversion algorithm
350-
351341
References
352342
----------
353343
[1] J. Rafiee & A. Reynolds, Inverse Problems 33 (11), 2017

popt/cost_functions/ren_npv.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ def ren_npv(pred_data, kwargs):
99
1010
Parameters
1111
----------
12-
pred_data_en : ndarray
12+
pred_data : ndarray
1313
Ensemble of predicted data.
1414
1515
**kwargs : dict
1616
Other arguments sent to the npv function
1717
18-
keys_opt : list
18+
- keys_opt (list)
1919
Keys with economic data.
2020
21-
report : list
21+
- report (list)
2222
Report dates.
2323
2424
Returns

popt/loop/dist.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,8 +315,9 @@ def delA(theta):
315315
316316
Parameters
317317
--------------------------------------------
318-
a : float
319-
b : float
318+
theta : tuple
319+
- a : float
320+
- b : float
320321
321322
Returns
322323
--------------------------------------------

popt/update_schemes/cma.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,23 +107,23 @@ def __call__(self, cov, step, X, J):
107107
108108
Parameters
109109
--------------------------------------------------
110-
cov : array_like, of shape (d, d)
111-
Current covariance or correlation matrix.
112-
113-
step : array_like, of shape (d,)
114-
New step of control vector.
115-
Used to update the evolution path.
110+
cov : array_like, of shape (d, d)
111+
Current covariance or correlation matrix.
112+
113+
step : array_like, of shape (d,)
114+
New step of control vector.
115+
Used to update the evolution path.
116116
117-
X : array_like, of shape (n, d)
118-
Control ensemble of size n.
119-
120-
J : array_like, of shape (n,)
121-
Objective ensemble of size n.
117+
X : array_like, of shape (n, d)
118+
Control ensemble of size n.
119+
120+
J : array_like, of shape (n,)
121+
Objective ensemble of size n.
122122
123123
Returns
124124
--------------------------------------------------
125-
out : array_like, of shape (d, d)
126-
CMA updated covariance (correlation) matrix.
125+
out : array_like, of shape (d, d)
126+
CMA updated covariance (correlation) matrix.
127127
'''
128128
a_mu = self.alpha_mu
129129
a_one = self.alpha_1

simulator/eclipse.py

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def setup_fwd_run(self, **kwargs):
216216
"""
217217
Setup the simulator.
218218
219-
Parameters
219+
Attributes
220220
----------
221221
assimIndex : int
222222
Gives the index-type (e.g. step,time,etc.) and the index for the
@@ -360,7 +360,7 @@ def coarsen(self, folder, ensembleMember=None):
360360
361361
Parameters
362362
----------
363-
Folder : str, optional
363+
folder : str, optional
364364
Path to the ecl_100 run folder.
365365
366366
ensembleMember : int, optional
@@ -796,22 +796,16 @@ def get_sim_results(self, whichResponse, ext_data_info=None, member=None):
796796
797797
Parameters
798798
----------
799-
file_rsm : str
800-
Summary file from ECL 100.
801-
802-
file_rst : str
803-
Restart file from ECL 100.
804-
805799
whichResponse : str
806800
Which of the responses is to be outputted (e.g., WBHP PRO-1, WOPR, PRESS, OILSAT, etc).
807801
808-
member : int, optional
809-
Ensemble member that is finished.
810-
811802
ext_data_info : tuple, optional
812803
Tuple containing the assimilation step information, including the place of assimilation (e.g., which TIME) and the
813804
index of this assimilation place.
814805
806+
member : int, optional
807+
Ensemble member that is finished.
808+
815809
Returns
816810
-------
817811
yFlow : array-like
@@ -1028,10 +1022,10 @@ def call_sim(self, path=None, wait_for_proc=False):
10281022
10291023
Parameters
10301024
----------
1031-
Path : str
1025+
path : str
10321026
Alternative folder for the ecl_100.data file.
10331027
1034-
Wait_for_proc : bool, optional
1028+
wait_for_proc : bool, optional
10351029
Logical variable to wait for the simulator to finish. Default is False.
10361030
10371031
Returns
@@ -1087,14 +1081,14 @@ def call_sim(self, path=None, wait_for_proc=False):
10871081
10881082
Parameters
10891083
----------
1090-
Path : str
1084+
path : str
10911085
Alternative folder for the ecl_100.data file.
10921086
1093-
Wait_for_proc : bool, optional
1087+
wait_for_proc : bool, optional
10941088
Logical variable to wait for the simulator to finish. Default is False.
10951089
1096-
!!! note
1097-
For now, this option is only utilized in a single localization option.
1090+
!!! note
1091+
For now, this option is only utilized in a single localization option.
10981092
10991093
Returns
11001094
-------

0 commit comments

Comments
 (0)