more outputField->Q

einarsd · Sep 26, 2016 · 4191238 · 4191238
1 parent 0c4c49b
commit 4191238
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/engine/average.go b/engine/average.go
@@ -8,11 +8,9 @@ import (
 )
 
 // average of quantity over universe
-func qAverageUniverse(q outputField) []float64 {
-	s, recycle := q.Slice()
-	if recycle {
-		defer cuda.Recycle(s)
-	}
+func qAverageUniverse(q Q) []float64 {
+	s := ValueOf(q)
+	defer cuda.Recycle(s)
 	return sAverageUniverse(s)
 }
 

diff --git a/engine/crop.go b/engine/crop.go
@@ -113,9 +113,10 @@ func rangeStr(a, b int) string {
 	// (trailing underscore to separate from subsequent autosave number)
 }
 
-func (q *cropped) NComp() int   { return q.parent.NComp() }
-func (q *cropped) Name() string { return q.name }
-func (q *cropped) Unit() string { return q.parent.Unit() }
+func (q *cropped) NComp() int             { return q.parent.NComp() }
+func (q *cropped) Name() string           { return q.name }
+func (q *cropped) Unit() string           { return q.parent.Unit() }
+func (q *cropped) EvalTo(dst *data.Slice) { EvalTo(q, dst) }
 
 func (q *cropped) Mesh() *data.Mesh {
 	c := q.parent.Mesh().CellSize()

diff --git a/engine/parameter.go b/engine/parameter.go
@@ -153,7 +153,8 @@ func (p *regionwise) IsUniform() bool {
 	return true
 }
 
-func (p *regionwise) average() []float64 { return qAverageUniverse(p) }
+func (p *regionwise) average() []float64     { return qAverageUniverse(p) }
+func (p *regionwise) EvalTo(dst *data.Slice) { EvalTo(p, dst) }
 
 // parameter derived from others (not directly settable). E.g.: Bsat derived from Msat
 type DerivedParam struct {