From bce43812a38702bddcb2f04d2f6a4ec576520663 Mon Sep 17 00:00:00 2001 From: Daniel Hardesty Lewis Date: Tue, 8 Feb 2022 19:20:16 -0500 Subject: [PATCH] Update dax-generator.py --- dax-generator.py | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/dax-generator.py b/dax-generator.py index f515faf..4e56d0b 100755 --- a/dax-generator.py +++ b/dax-generator.py @@ -63,7 +63,7 @@ e_pygeonet_skeleton_definition.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_pygeonet_skeleton_definition) -e_Network_Node_Reading = Executable(namespace="geoflood", name="main", version="Develop", installed=False) +e_Network_Node_Reading = Executable(namespace="geoflood", name="Network_Node_Reading", version="main", installed=False) e_Network_Node_Reading.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_Network_Node_Reading) @@ -71,7 +71,7 @@ e_Relative_Height_Estimation.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_Relative_Height_Estimation) -e_network_extraction = Executable(namespace="geoflood", name="network_extraction", version="main", installed=False) +e_network_extraction = Executable(namespace="geoflood", name="Network_Extraction", version="main", installed=False) e_network_extraction.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_network_extraction) @@ -83,7 +83,7 @@ e_dinfdistdown.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_dinfdistdown) -e_grass_delineation_py3 = Executable(namespace="geoflood", name="grass_delineation_py3", version="main", installed=False) +e_grass_delineation_py3 = Executable(namespace="geoflood", name="Grass_Delineation_py3", version="main", installed=False) e_grass_delineation_py3.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_grass_delineation_py3) @@ -95,7 +95,7 @@ e_Network_Mapping.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_Network_Mapping) -e_catchhydrogeo = Executable(namespace="geoflood", name="catchhydrogeo", version="main", installed=False) +e_catchhydrogeo = Executable(namespace="geoflood", name="catchhydrogeo", version="Develop", installed=False) e_catchhydrogeo.addPFN(PFN("file://" + sys.argv[1] + "/bin/pegasus-keg", "local")) geoflood.addExecutable(e_catchhydrogeo) @@ -181,7 +181,7 @@ geoflood.addJob(pygeonet_skeleton_definition) # Add left Findrange job -network_node_reading = Job(namespace="geoflood", name="network_node_reading", version="main") +network_node_reading = Job(namespace="geoflood", name="Network_Node_Reading", version="main") endpoints = File("GeoOutputs/GIS/my_project/dem_endPoints.csv") network_node_reading.addArguments("-a network_node_reading","-T5","-i",flowline,"-o",endpoints) network_node_reading.uses(flowline, link=Link.INPUT) @@ -192,7 +192,7 @@ geoflood.addJob(network_node_reading) # Add left Findrange job -relative_height_estimation = Job(namespace="geoflood", name="relative_height_estimation", version="main") +relative_height_estimation = Job(namespace="geoflood", name="Relative_Height_Estimation", version="main") negahand = File("GeoOutputs/GIS/my_project/dem_NegaHand.tif") nhdflowline = File("GeoOutputs/GIS/my_project/dem_nhdflowline.tif") allocation = File("GeoOutputs/GIS/my_project/dem_Allocation.tif") @@ -207,7 +207,7 @@ geoflood.addJob(relative_height_estimation) # Add left Findrange job -network_extraction = Job(namespace="geoflood", name="network_extraction", version="main") +network_extraction = Job(namespace="geoflood", name="Network_Extraction", version="main") channelnetwork = File("GeoOutputs/GIS/my_project/dem_channelNetwork.shp") cost = File("GeoOutputs/GIS/my_project/dem_cost.tif") path = File("GeoOutputs/GIS/my_project/dem_path.tif") @@ -226,7 +226,7 @@ geoflood.addJob(network_extraction) # Add right Findrange job -dinfflowdir = Job(namespace="geoflood", name="dinfflowdir", version="main") +dinfflowdir = Job(namespace="geoflood", name="dinfflowdir", version="Develop") slp = File("GeoOutputs/GIS/my_project/dem_slp.tif") ang = File("GeoOutputs/GIS/my_project/dem_ang.tif") dinfflowdir.addArguments("-a findrange","-T5","-i",fel,"-o",slp,ang) @@ -239,7 +239,7 @@ geoflood.addJob(dinfflowdir) # Add right Findrange job -dinfdistdown = Job(namespace="geoflood", name="dinfdistdown", version="main") +dinfdistdown = Job(namespace="geoflood", name="dinfdistdown", version="Develop") hand = File("GeoOutputs/GIS/my_project/dem_hand.tif") dinfdistdown.addArguments("-a findrange","-T5","-i",path,fel,slp,ang,"-o",hand) dinfdistdown.uses(path, link=Link.INPUT) @@ -253,7 +253,7 @@ geoflood.addJob(dinfdistdown) # Add right Findrange job -streamline_segmentation = Job(namespace="geoflood", name="streamline_segmentation", version="main") +streamline_segmentation = Job(namespace="geoflood", name="Streamline_Segmentation", version="main") channelsegment = File("GeoOutputs/GIS/my_project/dem_channelSegment.shp") streamline_segmentation.addArguments("-a streamline_segmentation","-T5","-i",channelnetwork,"-o",channgelsegment) streamline_segmentation.uses(channelnetwork, link=Link.INPUT) @@ -264,7 +264,7 @@ geoflood.addJob(streamline_segmentation) # Add right Findrange job -grass_delineation_py3 = Job(namespace="geoflood", name="grass_delineation_py3", version="main") +grass_delineation_py3 = Job(namespace="geoflood", name="Grass_Delineation_py3", version="main") segmentcatchmenttif = File("GeoOutputs/GIS/my_project/dem_segmentCatchment.tif") grass_delineation_py3.addArguments("-a grass_delineation_py3","-T5","-i",channelsegment,fdr,"-o",segmentcatchmenttif) grass_delineation_py3.uses(channelsegment, link=Link.INPUT) @@ -276,7 +276,7 @@ geoflood.addJob(grass_delineation_py3) # Add right Findrange job -river_attribute_estimation = Job(namespace="geoflood", name="river_attribute_estimation", version="main") +river_attribute_estimation = Job(namespace="geoflood", name="River_Attribute_Estimation", version="main") river_attribute = File("GeoOutputs/Hydraulics/my_project/dem_River_Attribute.txt") segmentcatchmentshp = File("GeoOutputs/GIS/my_project/dem_segmentCatchment.shp") river_attribute_estimation.addArguments("-a river_attribute_estimation","-T5","-i",channelsegment,segmentcatchmenttif,"-o",river_attribute,segmentcatchmentshp) @@ -290,7 +290,7 @@ geoflood.addJob(river_attribute_estimation) # Add right Findrange job -catchhydrogeo = Job(namespace="geoflood", name="catchhydrogeo", version="main") +catchhydrogeo = Job(namespace="geoflood", name="catchhydrogeo", version="Develop") hydroprop_basetable = File("GeoOutputs/Hydraulics/my_project/hydroprop-basetable.csv") catchhydrogeo.addArguments("-a catchhydrogeo","-T5","-i",river_attribute,stage,slp,segmentcatchmenttif,hand,"-o",hydroprop_basetable) catchhydrogeo.uses(river_attribute, link=Link.INPUT) @@ -305,7 +305,7 @@ geoflood.addJob(catchhydrogeo) # Add right Findrange job -network_mapping = Job(namespace="geoflood", name="network_mapping", version="main") +network_mapping = Job(namespace="geoflood", name="Network_Mapping", version="main") networkmapping = File("GeoOutputs/Hydraulics/my_project/dem_networkMapping.csv") network_mapping.addArguments("-a network_mapping","-T5","-i",catchment,"-o",networkmapping) network_mapping.uses(catchment, link=Link.INPUT) @@ -316,7 +316,7 @@ geoflood.addJob(network_mapping) # Add right Findrange job -hydraulic_property_postprocess = Job(namespace="geoflood", name="hydraulic_property_postprocess", version="main") +hydraulic_property_postprocess = Job(namespace="geoflood", name="Hydraulic_Property_Postprocess", version="main") hydroprop_fulltable = File("GeoOutputs/Hydraulics/my_project/hydroprop-fulltable.csv") hydraulic_property_postprocess.addArguments("-a hydraulic_property_postprocess","-T5","-i",networkmapping,comid_roughness,hydroprop_basetable,"-o",hydroprop_fulltable) hydraulic_property_postprocess.uses(networkmapping, link=Link.INPUT) @@ -329,7 +329,7 @@ geoflood.addJob(hydraulic_property_postprocess) # Add right Findrange job -forecast_table = Job(namespace="geoflood", name="forecast_table", version="main") +forecast_table = Job(namespace="geoflood", name="Forecast_Table", version="main") nwm_conusnc = File("GeoOutputs/NWM/my_project/nwm.....conus.nc") forecast_table.addArguments("-a forecast_table","-T5","-i",networkmapping,comid_roughness,hydroprop_basetable,"-o",hydroprop_fulltable) forecast_table.uses(networkmapping, link=Link.INPUT) @@ -342,7 +342,7 @@ geoflood.addJob(forecast_table) # Add right Findrange job -inunmap = Job(namespace="geoflood", name="inunmap", version="main") +inunmap = Job(namespace="geoflood", name="inunmap", version="Develop") nwm_inunmap = File("GeoOutputs/Inundation/my_project/dem_NWM_inunmap.tif") inunmap.addArguments("-a inunmap","-T5","-i",nwm_conusnc,segmentcatchmenttif,hand,"-o",nwm_inunmap) inunmap.uses(nwm_conusnc, link=Link.INPUT) @@ -360,22 +360,16 @@ geoflood.addDependency(Dependency(parent=pygeonet_nonlinear_filter, child=pygeonet_grass_py3)) geoflood.addDependency(Dependency(parent=pygeonet_nonlinear_filter, child=pygeonet_slope_curvature)) geoflood.addDependency(Dependency(parent=pygeonet_grass_py3, child=grass_delineation_py3)) -geoflood.addDependency(Dependency(parent=pygeonet_grass_py3, child=pygeonet_fast_marching)) geoflood.addDependency(Dependency(parent=pygeonet_grass_py3, child=pygeonet_skeleton_definition)) geoflood.addDependency(Dependency(parent=pygeonet_grass_py3, child=network_extraction)) -geoflood.addDependency(Dependency(parent=pygeonet_slope_curvature, child=pygeonet_fast_marching)) geoflood.addDependency(Dependency(parent=pygeonet_slope_curvature, child=pygeonet_skeleton_definition)) geoflood.addDependency(Dependency(parent=pygeonet_slope_curvature, child=network_extraction)) -geoflood.addDependency(Dependency(parent=pygeonet_skeleton_definition, child=pygeonet_fast_marching)) -geoflood.addDependency(Dependency(parent=pygeonet_skeleton_definition, child=pygeonet_channel_head_definition)) geoflood.addDependency(Dependency(parent=pygeonet_skeleton_definition, child=network_extraction)) -geoflood.addDependency(Dependency(parent=pygeonet_fast_marching, child=pygeonet_channel_head_definition)) geoflood.addDependency(Dependency(parent=network_node_reading, child=network_extraction)) geoflood.addDependency(Dependency(parent=relative_height_estimation, child=network_extraction)) geoflood.addDependency(Dependency(parent=network_extraction, child=streamline_segmentation)) geoflood.addDependency(Dependency(parent=network_extraction, child=dinfdistdown)) geoflood.addDependency(Dependency(parent=dinfflowdir, child=dinfdistdown)) -geoflood.addDependency(Dependency(parent=dinfflowdir, child=areadinf)) geoflood.addDependency(Dependency(parent=streamline_segmentation, child=grass_delineation_py3)) geoflood.addDependency(Dependency(parent=streamline_segmentation, child=network_mapping)) geoflood.addDependency(Dependency(parent=dinfdistdown, child=inunmap))