Skip to content

Commit a883331

Browse files
committed
consider timerange 200 (vectorial mean) as timerange 0 (average) for statistical processing
1 parent 0a78ad3 commit a883331

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

vol7d/vol7d_class_compute.F90

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ MODULE vol7d_class_compute
6565
!!
6666
!! see the description of vol7d_decompute_stat_proc()
6767
!!
68-
!! - \a stat_proc_input = 0, 1, 2, 3, 4
68+
!! - \a stat_proc_input = 0, 1, 2, 3, 4, 200
6969
!! - \a stat_proc = \a stat_proc_input recompute input data on
7070
!! different intervals
7171
!!
@@ -220,6 +220,7 @@ END SUBROUTINE vol7d_compute_stat_proc
220220
!! - 3 minimum
221221
!! - 4 difference
222222
!! - 6 standard deviation
223+
!! - 200 vectorial mean
223224
!!
224225
!! The start of processing period can be computed automatically from
225226
!! the input intervals as the first possible interval modulo \a step,
@@ -330,7 +331,7 @@ SUBROUTINE vol7d_recompute_stat_proc_agg(this, that, stat_proc, &
330331
IF (ndtr > 0 .AND. frac_c >= MAX(lfrac_valid, frac_m)) THEN
331332
frac_m = frac_c
332333
SELECT CASE(stat_proc)
333-
CASE (0) ! average
334+
CASE (0, 200) ! average, vectorial mean
334335
that%voldatir(i1,i,i3,j,i5,i6) = &
335336
SUM(this%voldatir(i1,:,i3,:,i5,i6), &
336337
mask=ttr_mask)/ndtr

volgrid6d/volgrid6d_class_compute.F90

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ MODULE volgrid6d_class_compute
6060
!!
6161
!! see the description of volgrid6d_decompute_stat_proc()
6262
!!
63-
!! - \a stat_proc_input = 0, 1, 2, 3, 4
63+
!! - \a stat_proc_input = 0, 1, 2, 3, 4, 200
6464
!! - \a stat_proc = \a stat_proc_input recompute input data on
6565
!! different intervals
6666
!!
@@ -202,6 +202,7 @@ END SUBROUTINE volgrid6d_compute_stat_proc
202202
!! - 2 maximum
203203
!! - 3 minimum
204204
!! - 4 difference
205+
!! - 200 vectorial mean
205206
!!
206207
!! The start of processing period can be computed automatically from
207208
!! the input intervals as the first possible interval modulo \a step,
@@ -295,7 +296,7 @@ SUBROUTINE volgrid6d_recompute_stat_proc_agg(this, that, stat_proc, step, start,
295296

296297
ELSE ! second or more time
297298
SELECT CASE(stat_proc)
298-
CASE (0, 1, 4) ! average, accumulation, difference
299+
CASE (0, 200, 1, 4) ! average, vectorial mean, accumulation, difference
299300
WHERE(c_e(voldatiin(:,:)) .AND. c_e(voldatiout(:,:)))
300301
voldatiout(:,:) = voldatiout(:,:) + voldatiin(:,:)
301302
ELSEWHERE

0 commit comments

Comments
 (0)