Skip to content

Commit 17970d3

Browse files
change filt variable from global to local (#399)
* change filt variable from global to local * fix single_opt method * update changelog --------- Co-authored-by: Michael Deceglie <[email protected]>
1 parent e7c402f commit 17970d3

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

docs/sphinx/source/changelog.rst

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
RdTools Change Log
22
==================
3+
.. include:: changelog/v2.1.8.rst
34
.. include:: changelog/v2.1.7.rst
45
.. include:: changelog/v2.1.6.rst
56
.. include:: changelog/v2.1.5.rst
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
**************************
2+
v2.1.8 (November 17, 2023)
3+
**************************
4+
5+
Bug fixes
6+
---------
7+
* Fix a bug in parallel computing environments (:issue:`388` :pull:`399`)
8+
9+
Contributors
10+
------------
11+
* Martin Springer (:ghuser:`martin-springer`)

rdtools/normalization.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ def irradiance_rescale(irrad, irrad_sim, max_iterations=100,
380380
'''
381381

382382
if method == 'iterative':
383-
def _rmse(fact):
383+
def _rmse(fact, filt):
384384
"""
385385
Calculates RMSE with a given rescale fact(or) according to global
386386
filt(er)
@@ -392,10 +392,9 @@ def _rmse(fact):
392392

393393
def _single_rescale(irrad, irrad_sim, guess):
394394
"Optimizes rescale factor once"
395-
global filt
396395
csi = irrad / (guess * irrad_sim) # clear sky index
397396
filt = (csi >= 0.8) & (csi <= 1.2) & (irrad > 200)
398-
min_result = minimize(_rmse, guess, method='Nelder-Mead')
397+
min_result = minimize(_rmse, guess, (filt), method='Nelder-Mead')
399398

400399
factor = min_result['x'][0]
401400
return factor

0 commit comments

Comments
 (0)