From 5dea4cb533a6fc9aa9549ee267901e29981c0344 Mon Sep 17 00:00:00 2001 From: andrewp-CWF <146005147+andrewp-CWF@users.noreply.github.com> Date: Thu, 17 Oct 2024 11:39:28 -0400 Subject: [PATCH] Additions for Tuzist'ol T'ah WCRP (#578) - Added geographic scope to wcrp_watsheds.csv - Added wcrp to ranking script --- data/wcrp_watersheds.csv | 8 +++++++- jobs/auto_rank.py | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/data/wcrp_watersheds.csv b/data/wcrp_watersheds.csv index d955b482..abbf5e1f 100644 --- a/data/wcrp_watersheds.csv +++ b/data/wcrp_watersheds.csv @@ -11,4 +11,10 @@ LNIC,t,,t,,,t,, NECL,t,,t,,t,,, QUES,t,,t,,t,,, SHUL,t,,t,,t,,, -USHU,t,,t,,t,,, \ No newline at end of file +USHU,t,,t,,t,,, +TAKL,t,,,,t,,, +MIDR,t,,,,t,,, +UTRE,t,,,,t,,, +LTRE,t,,,,t,,, +STUL,t,,,,t,,, +STUR,t,,,,t,,, \ No newline at end of file diff --git a/jobs/auto_rank.py b/jobs/auto_rank.py index 7c2cea16..9dd65869 100644 --- a/jobs/auto_rank.py +++ b/jobs/auto_rank.py @@ -29,7 +29,8 @@ def makeParser(): "eagle", "bessette", "bela_atna_necl", - "bowr_ques_carr" + "bowr_ques_carr", + "tuzitol_tah" ], nargs=1, type=str, @@ -155,6 +156,10 @@ def buildCondition(wcrp): c."watershed_group_code" IN ('BOWR', 'QUES', 'CARR') """ wcrp_schema = "bowr_ques_carr" + elif wcrp == "tuzitol_tah": + condition = """ + c."watershed_group_code" IN ('TAKL', 'MIDR', 'UTRE', 'LTRE', 'STUL', 'STUR') + """ else: # In all other cases, just the watershed group code condition = f"""