Don't generate surrogates if emis==0 (second try)

spatialmodel · Jan 29, 2022 · 5a6377f · 5a6377f
1 parent 70e27b1
commit 5a6377f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/inmaputil/inmap.go b/inmaputil/inmap.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"io"
 	"log"
+	"math"
 	"os"
 	"runtime"
 	"sync"
@@ -362,6 +363,13 @@ func setEmissionsAEP(inventoryConfig *aeputil.InventoryConfig, spatialConfig *ae
 			} else if err != nil {
 				return err
 			}
+			var totalEmis float64
+			for _, v := range rec.Totals() {
+				totalEmis += math.Abs(v.Value())
+			}
+			if totalEmis == 0 {
+				continue
+			}
 			spatialRecs = append(spatialRecs, rec.(aep.RecordGridded))
 		}
 

diff --git a/io.go b/io.go
@@ -274,13 +274,6 @@ func FromAEP(r []aep.RecordGridded, grids []*aep.GridDef, gi int, VOC, NOx, NH3,
 	groundERecs := make(map[int]*EmisRecord)
 
 	for _, rec := range r {
-		var totalEmis float64
-		for _, v := range rec.Totals() {
-			totalEmis += math.Abs(v.Value())
-		}
-		if totalEmis == 0 {
-			continue
-		}
 		gridSrg, _, inGrid, err := rec.GridFactors(gi)
 		if err != nil {
 			return nil, err