@@ -132,7 +132,7 @@ def nearest_int(T, latm, lonm, lond, latd, res='HR'):
132132 Td = griddata (points , values , (lond , latd ), method = 'nearest' )
133133 return Td .flatten ()
134134
135- def model_uncertainty (T , latm , lonm , lond , latd , deg = 2 , res = 'HR' ):
135+ def model_uncertainty (T , latm , lonm , lond , latd , deg = 3 , res = 'HR' ):
136136 # deg determines the degree box that is used to calculate the uncertainty
137137 # in the model due to the paleolocation
138138 # first nearest interpolate land values
@@ -157,9 +157,12 @@ def model_uncertainty(T, latm, lonm, lond, latd, deg = 2, res='HR'):
157157 for i in range (len (resl )):
158158 distances = (lond [i ]- lonmf )** 2 + (latd [i ]- latmf )** 2
159159 arg = np .argmin (distances )
160- idx = np .where (np .logical_and (np .logical_and (np .logical_and (lonmf >= lonmf [arg ]- deg ,lonmf <= lonmf [arg ]+ deg ),
161- latmf >= latmf [arg ]- deg ),
162- latmf <= latmf [arg ]+ deg ))
160+ # idx = np.where(np.logical_and(np.logical_and(np.logical_and(lonmf>=lonmf[arg]-deg,lonmf<=lonmf[arg]+deg),
161+ # latmf>=latmf[arg]-deg),
162+ # latmf<=latmf[arg]+deg))
163+ dist = np .sqrt ((lonmf - lonmf [arg ])** 2 + (latmf - latmf [arg ])** 2 )
164+
165+ idx = np .where (dist <= deg )
163166 resl [i ] = np .min (T [idx ])
164167 resh [i ] = np .max (T [idx ])
165168
0 commit comments