Skip to content

Use dataframe #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Use dataframe #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26fe285
pep8
Jul 25, 2018
28f26a8
explicit columns names
Jul 25, 2018
fe21200
doall returns dataframes
Jul 25, 2018
38b8620
DoIrradiation also returns dataframe
Jul 27, 2018
ce47cfb
use DEBUG parameter to avoid writting unnecessary info in tempRATP if…
Jul 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 20 additions & 22 deletions src/alinea/pyratp/RatpScene.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ def _dist(inc):

return grid, vox_id, sh_id, s

def do_irradiation(self, rleaf=[0.1], rsoil=0.20, doy=1, hour=12, Rglob=1, Rdif=1, mu=None, sources=None):
def do_irradiation(self, rleaf=(0.1,), rsoil=0.20, doy=1, hour=12, Rglob=1, Rdif=1, mu=None, sources=None):
""" Run a simulation of light interception for one wavelength

Parameters:
Expand All @@ -457,7 +457,7 @@ def do_irradiation(self, rleaf=[0.1], rsoil=0.20, doy=1, hour=12, Rglob=1, Rdif=

vegetation = Vegetation.initialise(entities, nblomin=1)

if sources == None:
if sources is None:
sky = Skyvault.initialise()
else:
el, az, w = sources
Expand All @@ -474,31 +474,29 @@ def do_irradiation(self, rleaf=[0.1], rsoil=0.20, doy=1, hour=12, Rglob=1, Rdif=

met = MicroMeteo.initialise(doy=doy, hour=hour, Rglob=Rglob, Rdif=Rdif)

res = runRATP.DoIrradiation(grid, vegetation, sky, met)
dfvox = runRATP.DoIrradiation(grid, vegetation, sky, met)

VegetationType,Iteration,day,hour,VoxelId,ShadedPAR,SunlitPAR,ShadedArea,SunlitArea= res.T
# 'PAR' is expected in Watt.m-2 in RATP input, whereas output is in micromol => convert back to W.m2 (cf shortwavebalance, line 306)
dfvox = pandas.DataFrame({'VegetationType':VegetationType,
'Iteration':Iteration,
'day':day,
'hour':hour,
'VoxelId':VoxelId,
'ShadedPAR':ShadedPAR / 4.6,
'SunlitPAR':SunlitPAR / 4.6,
'ShadedArea':ShadedArea,
'SunlitArea': SunlitArea,
'Area': ShadedArea + SunlitArea,
'PAR': (ShadedPAR * ShadedArea + SunlitPAR * SunlitArea) / (ShadedArea + SunlitArea) / 4.6,
})
dfvox = dfvox[dfvox['VegetationType'] > 0]
dfvox = pandas.merge(dfvox, self.voxel_map.loc[:,
('VoxelId', 'x', 'y', 'z', 'Volume')])
# 'PAR' is expected in Watt.m-2 in RATP input,
# whereas output is in micromol
# => convert back to W.m2 (cf shortwavebalance, line 306)
dfvox['ShadedPAR'] /= 4.6
dfvox['SunlitPAR'] /= 4.6

dfvox['Area'] = dfvox['ShadedArea'] + dfvox['SunlitArea']
dfvox['PAR'] = (dfvox['ShadedPAR'] * dfvox['ShadedArea']
+ dfvox['SunlitPAR'] * dfvox['SunlitArea']) / dfvox['Area']

dfvox = dfvox.reset_index(drop=True) # for backward compatibility reasons
# TODO avoid and perform concat instead of merge
dfvox = pandas.merge(dfvox, self.voxel_map.loc[:, ('VoxelId', 'x', 'y', 'z', 'Volume')])
index = range(len(voxel_id))
dfmap = pandas.DataFrame(
{'primitive_index': index, 'shape_id': shape_id,
{'primitive_index': index,
'shape_id': shape_id,
'VoxelId': voxel_id,
'VegetationType': [self.entity[sh_id] for sh_id in shape_id],
'primitive_area': areas})
'primitive_area': areas}
)

return dfvox, dfmap

Expand Down
34 changes: 13 additions & 21 deletions src/alinea/pyratp/interface/ratp_scene.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,28 +368,20 @@ def do_irradiation(self, sun_sources=None, sky_sources=None,
azmoy = numpy.array(azmoy) - 180 + self.orientation
sky = Skyvault.initialise(hmoy=hmoy, azmoy=azmoy, omega=omega, pc=pc)
met = MicroMeteo.initialise(doy=1, hour=12, Rglob=ghi, Rdif=ghi)
res = runRATP.DoIrradiation(self.ratp_grid, vegetation, sky, met)

VegetationType, Iteration, day, hour, VoxelId, ShadedPAR, SunlitPAR, \
ShadedArea, SunlitArea = res.T
# 'PAR' is expected in Watt.m-2 in RATP input, whereas output is in
# micromol => convert back to W.m2 (cf shortwavebalance, line 306)
dfvox = pandas.DataFrame({'VegetationType': VegetationType,
'Iteration': Iteration,
'day': day,
'hour': hour,
'VoxelId': VoxelId,
'ShadedPAR': ShadedPAR / 4.6,
'SunlitPAR': SunlitPAR / 4.6,
'ShadedArea': ShadedArea,
'SunlitArea': SunlitArea,
'Area': ShadedArea + SunlitArea,
'PAR': (
ShadedPAR * ShadedArea + SunlitPAR *
SunlitArea) / (
ShadedArea + SunlitArea) / 4.6,
})
dfvox = runRATP.DoIrradiation(self.ratp_grid, vegetation, sky, met)

# 'PAR' is expected in Watt.m-2 in RATP input,
# whereas output is in micromol
# => convert back to W.m2 (cf shortwavebalance, line 306)
dfvox['ShadedPAR'] /= 4.6
dfvox['SunlitPAR'] /= 4.6

dfvox['Area'] = dfvox['ShadedArea'] + dfvox['SunlitArea']
dfvox['PAR'] = (dfvox['ShadedPAR'] * dfvox['ShadedArea']
+ dfvox['SunlitPAR'] * dfvox['SunlitArea']) / dfvox['Area']

dfvox = dfvox.reset_index(drop=True) # for backward compatibility reasons
# TODO avoid and perform concat instead of merge
return pandas.merge(dfvox, self.voxel_index())

def scene_lightmap(self, dfvox, spatial='point_id', temporal=True):
Expand Down
Loading