Gab

pals/R/1DAnnualCycle.R

@@ -8,7 +8,7 @@
 # Gab Abramowitz CCRC, UNSW 2014 (palshelp at gmail dot com)
 #
 AnnualCycle = function(obslabel,acdata,varname,ytext,legendtext,
-	timestepsize,whole,modlabel='no'){
+	timestepsize,whole,plotcolours,modlabel='no'){
 	######
 	errtext = 'ok'
 	metrics = list()
@@ -48,7 +48,6 @@ AnnualCycle = function(obslabel,acdata,varname,ytext,legendtext,
 		}
 	}
 	xloc=c(1:12) # set location of x-coords
-	plotcolours=LineColours()
 	# Plot model output result:
 	yaxmin=min(data_monthly) # y axis minimum in plot
 	yaxmax=max(data_monthly)+0.18*(max(data_monthly)-yaxmin) # y axis maximum in plot

pals/R/1DDiurnalCycle.R

@@ -7,7 +7,7 @@
 # Gab Abramowitz CCRC, UNSW 2014 (palshelp at gmail dot com)
 #
 DiurnalCycle = function(obslabel,dcdata,varname,ytext,legendtext,
-	timestepsize,whole,modlabel='no',vqcdata=matrix(-1,nrow=1,ncol=1)){
+	timestepsize,whole,plotcolours,modlabel='no',vqcdata=matrix(-1,nrow=1,ncol=1)){
 	errtext = 'ok'
 	metrics = list()
 	if(!whole){ # we need a whole number of years for this to run
@@ -144,7 +144,6 @@ DiurnalCycle = function(obslabel,dcdata,varname,ytext,legendtext,
 	xloc=c(0:(tstepinday-1)) # set location of x-coords in plot
 	yaxmin=min(avday) # y axis minimum in plot
 	yaxmax=max(avday)+(max(avday)-yaxmin)*0.15 # y axis maximum in plot
-	plotcolours=LineColours() 
 	# Now plot each panel:
 	for(k in 1:4){# for each season (DJF, MAM etc)
 		# Plot obs data result:

pals/R/1DPdf.R

@@ -5,15 +5,14 @@
 # Gab Abramowitz UNSW 2014 (palshelp at gmail dot com)
 
 PALSPdf = function(obslabel,pdfdata,varname,xtext,legendtext,timing,
-	nbins=500,modlabel='no',vqcdata=matrix(-1,nrow=1,ncol=1)){
+	nbins=500,plotcolours,modlabel='no',vqcdata=matrix(-1,nrow=1,ncol=1)){
 	errtext = 'ok'
 	metrics = list()
 	xcut = 1/100
 	ncurves = length(pdfdata[1,]) # Number of curves in final plot:
 	ntsteps = length(pdfdata[,1]) # Number of timesteps in data:
 	tstepinday=86400/timing$tstepsize # number of time steps in a day
 	ndays = ntsteps/tstepinday # number of days in data set
-	plotcolours=LineColours() 
 	xmin = min(pdfdata)
 	xmax = max(pdfdata)
 	allden = list()
@@ -72,14 +71,14 @@ PALSPdf = function(obslabel,pdfdata,varname,xtext,legendtext,timing,
 		scoretext = paste(overl,collapse=', ')
 		text(x=(xlow+(xhigh-xlow)*0.75),y=ymax*0.6,labels=paste('Overlap: ',scoretext,'%',sep=''),pos=4)
 		if(ncurves==2){ # model only
-			metrics[[1]] = list(name='PDFoverlap%',model_value=overl[1])	
+			metrics[[1]] = list(name='%Overlap',model_value=overl[1])	
 		}else if(ncurves==3){
-			metrics[[1]] = list(name='PDFoverlap%',model_value=overl[1],bench_value=list(bench1=overl[2]))	
+			metrics[[1]] = list(name='%Overlap',model_value=overl[1],bench_value=list(bench1=overl[2]))	
 		}else if(ncurves==4){
-			metrics[[1]] = list(name='PDFoverlap%',model_value=overl[1],
+			metrics[[1]] = list(name='%Overlap',model_value=overl[1],
 				bench_value=list(bench1=overl[2],bench2=overl[3]))
 		}else if(ncurves==5){
-			metrics[[1]] = list(name='PDFoverlap%',model_value=overl[1],
+			metrics[[1]] = list(name='%Overlap',model_value=overl[1],
 				bench_value=list(bench1=overl[2],bench2=overl[3],bench3=overl[4]))
 		}
 	}