Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions WorkflowManager/workflows/wildfire/hotspots.py
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,8 @@ def wildfire_process_hotspots(msg):
upperLeft = i.upper_left_latlong
lowerRight = i.lower_right_latlong

lonmin, latmax = upperLeft.split("/")
lonmax, latmin = lowerRight.split("/")
latmax, lonmin = upperLeft.split("/")
latmin, lonmax = lowerRight.split("/")

lonmin = float(lonmin)
latmax = float(latmax)
Expand Down
4 changes: 2 additions & 2 deletions WorkflowManager/workflows/wildfire/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ def wildfire_init(msg):
raise Exception("Location extents must be of the form longitude/latitude")

try:
upperLeftLon, upperLeftLat = upperLeft.split("/")
lowerRightLon, lowerRightLat = lowerRight.split("/")
upperLeftLat, upperLeftLon = upperLeft.split("/")
lowerRightLat, lowerRightLon = lowerRight.split("/")

float(upperLeftLat)
float(upperLeftLon)
Expand Down
8 changes: 4 additions & 4 deletions WorkflowManager/workflows/wildfire/mesoNH.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ def wildfire_mesonh_physiographic(msg):
upperLeft = i.upper_left_latlong
lowerRight = i.lower_right_latlong

upperLeftLon, upperLeftLat = upperLeft.split("/")
lowerRightLon, lowerRightLat = lowerRight.split("/")
upperLeftLat, upperLeftLon = upperLeft.split("/")
lowerRightLat, lowerRightLon = lowerRight.split("/")

sample_configuration_file = open("workflows/wildfire/templates/prep_pgd.yml")
yaml_template = yaml.load(sample_configuration_file, Loader=yaml.FullLoader)
Expand Down Expand Up @@ -280,8 +280,8 @@ def _buildMesoNHYaml(incidentId, machine_basedir, simulation_location, gfs_file1
upperLeft = myincident.upper_left_latlong
lowerRight = myincident.lower_right_latlong

upperLeftLon, upperLeftLat = upperLeft.split("/")
lowerRightLon, lowerRightLat = lowerRight.split("/")
upperLeftLat, upperLeftLon = upperLeft.split("/")
lowerRightLat, lowerRightLon = lowerRight.split("/")

sample_configuration_file = open("workflows/wildfire/templates/mesonh.yml")
yaml_template = yaml.load(sample_configuration_file, Loader=yaml.FullLoader)
Expand Down
4 changes: 2 additions & 2 deletions WorkflowManager/workflows/wildfire/wildfire.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@ def _buildWFAYaml(incidentId, weather_datainfo):
lowerRight = myincident.lower_right_latlong
duration = myincident.duration

upperLeftLon, upperLeftLat = upperLeft.split("/")
lowerRightLon, lowerRightLat = lowerRight.split("/")
upperLeftLat, upperLeftLon = upperLeft.split("/")
lowerRightLat, lowerRightLon = lowerRight.split("/")

sample_configuration_file = open("workflows/wildfire/templates/wfa.yml")
yaml_template = yaml.load(sample_configuration_file, Loader=yaml.FullLoader)
Expand Down