inclusion of more information into modelBuoy_collocation processing a…

…nd outputs (#9) Standardization of variables names in the output files, and inclusion of more information into modelBuoy_collocation processing and outputs.
NOAA-EMC · May 19, 2022 · aaab34d · aaab34d
1 parent 8e2705b
commit aaab34d
Show file tree

Hide file tree

Showing 8 changed files with 402 additions and 248 deletions.
diff --git a/postproc/comparevalww3board.py b/postproc/comparevalww3board.py
@@ -155,11 +155,11 @@
 	# WAVEWATCH III --------------------------
 	if it==0:
 		fname=wrun1+"/ww3gefs."+cdate+"_spec.nc"
-		spm_time,lixo,lixo,lixo,spm_freq,spm_freq1,spm_freq2,spm_dfreq,spm_pspec1,spm_dmspec1,spm_dire,spm_dspec1 = wread.spec_ww3(fname,stname)
+		spm_time,lixo,lixo,lixo,spm_freq,spm_freq1,spm_freq2,spm_dfreq,spm_pspec1,spm_dmspec1,spm_dire,spm_dspec1,lixo,lixo = wread.spec_ww3(fname,stname)
 		del fname
 	else:
 		fname=wrun1+"/ww3gefs."+cdate+"_spec.nc"
-		aspm_time,lixo,lixo,lixo,lixo,lixo,lixo,lixo,aspm_pspec1,aspm_dmspec1,lixo,aspm_dspec1 = wread.spec_ww3(fname,stname)
+		aspm_time,lixo,lixo,lixo,lixo,lixo,lixo,lixo,aspm_pspec1,aspm_dmspec1,lixo,aspm_dspec1,lixo,lixo = wread.spec_ww3(fname,stname)
 		del fname
 		spm_time = np.append(spm_time,aspm_time)
 		spm_pspec1 = np.append(spm_pspec1,aspm_pspec1,axis=0)
@@ -168,11 +168,11 @@
 
 	if it==0:
 		fname=wrun2+"/ww3gefs."+cdate+"_spec.nc"
-		lixo,lixo,lixo,lixo,lixo,lixo,lixo,lixo,spm_pspec2,spm_dmspec2,lixo,spm_dspec2 = wread.spec_ww3(fname,stname)
+		lixo,lixo,lixo,lixo,lixo,lixo,lixo,lixo,spm_pspec2,spm_dmspec2,lixo,spm_dspec2,lixo,lixo = wread.spec_ww3(fname,stname)
 		del fname
 	else:
 		fname=wrun2+"/ww3gefs."+cdate+"_spec.nc"
-		lixo,lixo,lixo,lixo,lixo,lixo,lixo,lixo,aspm_pspec2,aspm_dmspec2,lixo,aspm_dspec2 = wread.spec_ww3(fname,stname)
+		lixo,lixo,lixo,lixo,lixo,lixo,lixo,lixo,aspm_pspec2,aspm_dmspec2,lixo,aspm_dspec2,lixo,lixo = wread.spec_ww3(fname,stname)
 		del fname
 		spm_pspec2 = np.append(spm_pspec2,aspm_pspec2,axis=0)
 		spm_dmspec2 = np.append(spm_dmspec2,aspm_dmspec2,axis=0)

diff --git a/postproc/wread.py b/postproc/wread.py
@@ -354,6 +354,6 @@ def spec_ww3(*args):
 				d1sp[t,il]=np.float(aux)
 				del a,b,aux
 
-	return mdate,mtime,lat,lon,freq,freq1,freq2,dfreq,pwst,d1sp,dire,dspec
+	return mdate,mtime,lat,lon,freq,freq1,freq2,dfreq,pwst,d1sp,dire,dspec,wnds,wndd