Commit d009890e authored by Carl Schreck's avatar Carl Schreck
Browse files

Automated Nightly Commit - Wed Aug 1 00:00:39 EDT 2018

parent 6fc2b1c7
......@@ -20,13 +20,13 @@ function composite_xy_preread( \
begin
if( i_allData&time@units.ne.i_baseDates@units ) then
print( "Note: composite_xy_preread is modifying the units of i_allData: " \
+ i_allData@long_name )
i_allData&time = cd_convert( i_allData&time, i_baseDates@units )
baseDates = cd_convert( i_baseDates, i_allData&time@units )
else
baseDates = i_baseDates
end if
allDates = i_allData&time
populationDates = dates_from_other_years( i_baseDates, allDates )
populationDates = dates_from_other_years( baseDates, allDates )
dims = dimsizes(i_allData)
nPop = dimsizes(populationDates)
......@@ -51,7 +51,7 @@ begin
print_clock( "Compositing" )
do l = 0, nLag-1
lagInd := common_ind( i_baseDates + i_lag(l), allDates )
lagInd := common_ind( baseDates + i_lag(l), allDates )
if( all( ismissing(lagInd) ) ) then
; No valid dates
......@@ -59,7 +59,7 @@ begin
retVal@nDates(l) = 0
else
; Ok, we're good
sampDates := i_baseDates(lagInd) + i_lag(l)
sampDates := totype( baseDates(lagInd) + i_lag(l), typeof(allDates) )
sample := i_allData({sampDates},:,:)
retVal(l,:,:) = dim_avg_n( sample, 0 )
retVal@nDates(l) = dimsizes(sampDates)
......
......@@ -89,7 +89,9 @@ begin ; ibt_map_all_storms
do stormCounter = 0, dimsizes(name)-1
inTime = any( ( time(stormCounter,:).ge.minTime ) \
.and.( time(stormCounter,:).le.maxTime ) )
; print( stormCounter + " " + any( inBasin(stormCounter,:) ) + " " + inTime + " "+ aboveMinWind(stormCounter) + " " + .not.ismissing( aboveMinWind(stormCounter) ) )
if( any( inBasin(stormCounter,:) ).and.inTime \
.and.( .not.ismissing( aboveMinWind(stormCounter) ) ) \
.and.( aboveMinWind(stormCounter) ) ) then
;print( name(stormCounter) + " " + minWind + " " + aboveMinWind(stormCounter) + " " + lmi(stormCounter) )
ibt_map_one_storm( io_wks, io_plot, thresh, colors, \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment