@@ -27,24 +27,19 @@ pvdeg.utilities
27
27
pvdeg.utilities.get_kinetics
28
28
pvdeg.utilities.get_state_bbox
29
29
pvdeg.utilities.gid_downsampling
30
- <<<<<<< HEAD
31
30
pvdeg.utilities.kj_mol_to_ev
32
- pvdeg.utilities.meta_as_dict
33
- pvdeg.utilities.plot_water_2d
34
- pvdeg.utilities.quantile_df
35
- =======
36
31
pvdeg.utilities.linear_normalize
37
32
pvdeg.utilities.merge_sparse
38
33
pvdeg.utilities.meta_as_dict
39
34
pvdeg.utilities.new_id
40
35
pvdeg.utilities.nrel_kestrel_check
36
+ pvdeg.utilities.plot_water_2d
41
37
pvdeg.utilities.quantile_df
42
38
pvdeg.utilities.read_material
43
39
pvdeg.utilities.remove_scenario_filetrees
44
40
pvdeg.utilities.restore_gids
45
41
pvdeg.utilities.search_json
46
42
pvdeg.utilities.strip_normalize_tmy
47
- >>>>>>> development
48
43
pvdeg.utilities.tilt_azimuth_scan
49
44
pvdeg.utilities.ts_gid_df
50
45
pvdeg.utilities.write_gids
@@ -119,13 +114,13 @@ pvdeg.utilities
119
114
.. minigallery :: pvdeg.utilities.gid_downsampling
120
115
:add-heading:
121
116
122
- <<<<<<< HEAD
123
117
.. autofunction :: kj_mol_to_ev
124
118
125
119
.. _sphx_glr_backref_pvdeg.utilities.kj_mol_to_ev :
126
120
127
121
.. minigallery :: pvdeg.utilities.kj_mol_to_ev
128
- =======
122
+ :add-heading:
123
+
129
124
.. autofunction :: linear_normalize
130
125
131
126
.. _sphx_glr_backref_pvdeg.utilities.linear_normalize :
@@ -138,7 +133,6 @@ pvdeg.utilities
138
133
.. _sphx_glr_backref_pvdeg.utilities.merge_sparse :
139
134
140
135
.. minigallery :: pvdeg.utilities.merge_sparse
141
- >>>>>>> development
142
136
:add-heading:
143
137
144
138
.. autofunction :: meta_as_dict
@@ -148,13 +142,6 @@ pvdeg.utilities
148
142
.. minigallery :: pvdeg.utilities.meta_as_dict
149
143
:add-heading:
150
144
151
- <<<<<<< HEAD
152
- .. autofunction :: plot_water_2d
153
-
154
- .. _sphx_glr_backref_pvdeg.utilities.plot_water_2d :
155
-
156
- .. minigallery :: pvdeg.utilities.plot_water_2d
157
- =======
158
145
.. autofunction :: new_id
159
146
160
147
.. _sphx_glr_backref_pvdeg.utilities.new_id :
@@ -167,7 +154,13 @@ pvdeg.utilities
167
154
.. _sphx_glr_backref_pvdeg.utilities.nrel_kestrel_check :
168
155
169
156
.. minigallery :: pvdeg.utilities.nrel_kestrel_check
170
- >>>>>>> development
157
+ :add-heading:
158
+
159
+ .. autofunction :: plot_water_2d
160
+
161
+ .. _sphx_glr_backref_pvdeg.utilities.plot_water_2d :
162
+
163
+ .. minigallery :: pvdeg.utilities.plot_water_2d
171
164
:add-heading:
172
165
173
166
.. autofunction :: quantile_df
@@ -177,8 +170,6 @@ pvdeg.utilities
177
170
.. minigallery :: pvdeg.utilities.quantile_df
178
171
:add-heading:
179
172
180
- <<<<<<< HEAD
181
- =======
182
173
.. autofunction :: read_material
183
174
184
175
.. _sphx_glr_backref_pvdeg.utilities.read_material :
@@ -214,7 +205,6 @@ pvdeg.utilities
214
205
.. minigallery :: pvdeg.utilities.strip_normalize_tmy
215
206
:add-heading:
216
207
217
- >>>>>>> development
218
208
.. autofunction :: tilt_azimuth_scan
219
209
220
210
.. _sphx_glr_backref_pvdeg.utilities.tilt_azimuth_scan :
0 commit comments