Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
FedericoTartarini committed Mar 15, 2022
2 parents aede84d + fc143fe commit d1ba3d6
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion examples/calc_pmv_ppd.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@
results = np.vectorize(pmv_ppd)(ta, tr, v_rel, rh, met, clo_d, 0, "ashrae", "SI")

# split the pmv column in two since currently contains both pmv and ppd values
df_ = pd.DataFrame(results)
#results is an np.array and should be cast into a list before converted to a dataframe
df_ = pd.DataFrame(list(results))
df = pd.concat([df, df_], axis=1, sort=False)

end = time.time()
Expand Down

0 comments on commit d1ba3d6

Please sign in to comment.