Skip to content

Uat2 updates consensus fix #30

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
SteveCoss wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Uat2 updates consensus fix #30

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
580af9e
fix hivdi commented out and generation of consensus, now uses flpe
SteveCoss Dec 3, 2025
d44199c
linked sos_read commented out
SteveCoss Dec 3, 2025
08e843d
tested offline and uncomented needed import for online run
SteveCoss Dec 3, 2025
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
40 changes: 27 additions & 13 deletions validation_confluence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

# Local imports
from val.validation import stats
from sos_read.sos_read import download_sos
from sos_read.sos_read import download_sos #this import does not work on a singularity container adn must be commented out to run offline

# Third-party imports
from netCDF4 import Dataset, stringtochar,chartostring
Expand Down Expand Up @@ -315,17 +315,19 @@ def read_flpe_data(self,flpe_dir):
"hivdi":"reach/Q",
"momma":"Q",
"sad":"Qa",
"sic4dvar":"Q_da",
"sic4dvar":"Q_da",
"consensus":"consensus_q",


}

flpe_file_metroman = f"{flpe_dir}/{'metroman'}/{self.reach_id}_metroman.nc"
flpe_file_neobam = f"{flpe_dir}/{'geobam'}/{self.reach_id}_geobam.nc"
# flpe_file_hivdi = f"{flpe_dir}/{'hivdi'}/{self.reach_id}_h2ivdi.nc"
flpe_file_hivdi = f"{flpe_dir}/{'hivdi'}/{self.reach_id}_h2ivdi.nc"
flpe_file_momma = f"{flpe_dir}/{'momma'}/{self.reach_id}_momma.nc"
flpe_file_sad = f"{flpe_dir}/{'sad'}/{self.reach_id}_sad.nc"
flpe_file_sic4dvar = f"{flpe_dir}/{'sic4dvar'}/{self.reach_id}_sic4dvar.nc"
flpe_file_consensus = f"{flpe_dir}/{'consensus'}/{self.reach_id}_consensus.nc"
try:
flpe_mm = Dataset(flpe_file_metroman, 'r')
except:
Expand All @@ -350,6 +352,10 @@ def read_flpe_data(self,flpe_dir):
flpe_si = Dataset(flpe_file_sic4dvar, 'r')
except:
flpe_si=-9999
try:
flpe_co = Dataset(flpe_file_consensus, 'r')
except:
flpe_co=-9999


flpe_data = {}
Expand Down Expand Up @@ -392,18 +398,25 @@ def read_flpe_data(self,flpe_dir):
conlen=len(flpe_data["sic4dvar"])
flpe_si.close()

if flpe_co==-9999:
flpe_data["consensus"]=-9999
else:
flpe_data["consensus"] = flpe_si[convention_dict["consensus"]][:].filled(np.nan)
conlen=len(flpe_data["consensus"])
flpe_si.close()

if conlen > 0:
#create pre-offline consensus
ALLQ=np.full((len(flpe_data.keys()), conlen), np.nan)
for row in range(len(flpe_data.keys())):
ALGv=flpe_data[list(flpe_data.keys())[row]]
if np.size(ALGv)==conlen:
ALGv[ALGv<0]=np.nan
ALLQ[row,:]=ALGv
# #create pre-offline consensus
# ALLQ=np.full((len(flpe_data.keys()), conlen), np.nan)
# for row in range(len(flpe_data.keys())):
# ALGv=flpe_data[list(flpe_data.keys())[row]]
# if np.size(ALGv)==conlen:
# ALGv[ALGv<0]=np.nan
# ALLQ[row,:]=ALGv


consensus=np.nanmedian(ALLQ,axis=0)
flpe_data["consensus"]=consensus
# consensus=np.nanmedian(ALLQ,axis=0)
# flpe_data["consensus"]=consensus


if self.is_flpe_valid(flpe_data):
Expand Down Expand Up @@ -949,7 +962,8 @@ def run_validation():
if sos_bucket:
gage_dir = TMP_DIR
else:
gage_dir = INPUT_DIR.joinpath("sos")
#gage_dir = INPUT_DIR.joinpath("sos")
gage_dir = INPUT.joinpath("sos")

vc = ValidationConfluence(reach_data, FLPE, MOI, OFFLINE, INPUT, OUTPUT, run_type, gage_dir)
vc.validate()
Expand Down
Loading