@@ -106,11 +106,15 @@ def df(self) -> pd.DataFrame:
106
106
assert isinstance (wateroilgas , WaterOilGas )
107
107
assert wateroilgas .wateroil is not None
108
108
assert wateroilgas .gasoil is not None
109
- wateroil_cols = set (wateroilgas .wateroil .table .columns ).intersection (
110
- wateroil_pyscal_cols
109
+ wateroil_cols = list (
110
+ set (wateroilgas .wateroil .table .columns ).intersection (
111
+ wateroil_pyscal_cols
112
+ )
111
113
)
112
- gasoil_cols = set (wateroilgas .gasoil .table .columns ).intersection (
113
- gasoil_pyscal_cols
114
+ gasoil_cols = list (
115
+ set (wateroilgas .gasoil .table .columns ).intersection (
116
+ gasoil_pyscal_cols
117
+ )
114
118
)
115
119
df_list .append (
116
120
wateroilgas .gasoil .table [gasoil_cols ]
@@ -134,11 +138,15 @@ def df(self) -> pd.DataFrame:
134
138
assert scalrec .base .gasoil is not None
135
139
assert scalrec .high .wateroil is not None
136
140
assert scalrec .high .gasoil is not None
137
- gasoil_cols = set (scalrec .base .gasoil .table .columns ).intersection (
138
- gasoil_pyscal_cols
141
+ gasoil_cols = list (
142
+ set (scalrec .base .gasoil .table .columns ).intersection (
143
+ gasoil_pyscal_cols
144
+ )
139
145
)
140
- wateroil_cols = set (scalrec .base .wateroil .table .columns ).intersection (
141
- wateroil_pyscal_cols
146
+ wateroil_cols = list (
147
+ set (scalrec .base .wateroil .table .columns ).intersection (
148
+ wateroil_pyscal_cols
149
+ )
142
150
)
143
151
df_list .append (
144
152
scalrec .low .gasoil .table [gasoil_cols ]
@@ -175,8 +183,8 @@ def df(self) -> pd.DataFrame:
175
183
for (satnum , wateroil ) in enumerate (self .pyscal_list ):
176
184
assert isinstance (wateroil , WaterOil )
177
185
assert wateroil is not None
178
- wateroil_cols = set ( wateroil . table . columns ). intersection (
179
- wateroil_pyscal_cols
186
+ wateroil_cols = list (
187
+ set ( wateroil . table . columns ). intersection ( wateroil_pyscal_cols )
180
188
)
181
189
df_list .append (
182
190
wateroil .table [wateroil_cols ]
@@ -187,7 +195,9 @@ def df(self) -> pd.DataFrame:
187
195
for (satnum , gasoil ) in enumerate (self .pyscal_list ):
188
196
assert isinstance (gasoil , GasOil )
189
197
assert gasoil is not None
190
- gasoil_cols = set (gasoil .table .columns ).intersection (gasoil_pyscal_cols )
198
+ gasoil_cols = list (
199
+ set (gasoil .table .columns ).intersection (gasoil_pyscal_cols )
200
+ )
191
201
df_list .append (
192
202
gasoil .table [gasoil_cols ]
193
203
.assign (SATNUM = satnum + 1 )
0 commit comments