Fix lon/lat file for genesis day (#91)

* Add validation check to GenerateDistributions * fix to jdays data
GeoscienceAustralia · May 12, 2020 · 5f83ae6 · 5f83ae6
1 parent 5a54388
commit 5f83ae6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/StatInterface/GenerateDistributions.py b/StatInterface/GenerateDistributions.py
@@ -154,6 +154,13 @@ def allDistributions(self, lonLat, parameterList, parameterName=None,
 
         self.pName = parameterName
 
+        if len(self.pList) != len(self.lonLat):
+            errmsg = ("Parameter data and "
+                      "Lon/Lat data are not the same length "
+                      "for {}.".format(parameterName))
+            self.logger.critical(errmsg)
+            raise IndexError(errmsg)
+
         maxCellNum = stats.maxCellNum(self.gridLimit, self.gridSpace)
 
         # Writing CDF dataset for all individual cell number into files

diff --git a/StatInterface/StatInterface.py b/StatInterface/StatInterface.py
@@ -113,7 +113,7 @@ def kdeGenesisDate(self):
         log.debug('Reading data from %s',
                   pjoin(self.processPath, 'jdays'))
         pList = pjoin(self.processPath, 'jdays')
-        lonLat = pjoin(self.processPath, 'init_lon_lat')
+        lonLat = pjoin(self.processPath, 'origin_lon_lat')
         kde = KDEParameters.KDEParameters(self.kdeType)
         #kde.generateGenesisDateCDF(jdays, lonLat, bw=14,
         #                           genesisKDE=pjoin(self.processPath,