diff --git a/pollination/three_phase/entry.py b/pollination/three_phase/entry.py index 5664f4f..b16add1 100644 --- a/pollination/three_phase/entry.py +++ b/pollination/three_phase/entry.py @@ -286,7 +286,8 @@ def prepare_three_phase( ): return [ { - 'from': ThreePhaseInputsPreparation()._outputs.multiplication_info + 'from': ThreePhaseInputsPreparation()._outputs.multiplication_info, + 'to': '../../calcs/3_phase/info/multiplication_info.json' }, { 'from': ThreePhaseInputsPreparation()._outputs.grouped_apertures_info, @@ -298,12 +299,18 @@ def prepare_three_phase( } ] + @task(template=ReadJSONList, needs=[prepare_three_phase]) + def multiplication_info_to_json( + self, src=prepare_three_phase._outputs.multiplication_info + ): + return [{'from': ReadJSONList()._outputs.data}] + @task( template=ThreePhaseMatrixCalculation, needs=[ create_rad_folder, prepare_multiphase, create_total_sky, create_sky_dome, - prepare_three_phase + prepare_three_phase, multiplication_info_to_json ], sub_folder='calcs/3_phase', sub_paths={ @@ -314,7 +321,7 @@ def calculate_three_phase_matrix_total( self, model_folder=create_rad_folder._outputs.model_folder, grouped_apertures_folder=prepare_three_phase._outputs.grouped_apertures_folder, - multiplication_info=prepare_three_phase._outputs.multiplication_info, + multiplication_info=multiplication_info_to_json._outputs.data, receivers=create_rad_folder._outputs.receivers, view_mtx_rad_params=view_mtx_rad_params, daylight_mtx_rad_params=daylight_mtx_rad_params, diff --git a/pollination/three_phase/three_phase/preparation.py b/pollination/three_phase/three_phase/preparation.py index 7fae97a..01357c7 100644 --- a/pollination/three_phase/three_phase/preparation.py +++ b/pollination/three_phase/three_phase/preparation.py @@ -93,7 +93,7 @@ def get_three_phase_combinations( 'calculation.', source='model/sender/_info.json' ) - multiplication_info = Outputs.list( + multiplication_info = Outputs.file( description='A JSON file with matrix multiplication information.', source='multiplication_info.json' )