From 0b9c6129863d5130ed849e657590f4c987061d22 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 12 Mar 2021 14:45:11 -0700
Subject: [PATCH] cleanup

---
 .../nshmp/netcdf/converters/convert.py        |   1 -
 .../nshmp/netcdf/NshmNetcdfReaderTests.java   |   2 +-
 .../netcdf/reader/NetcdfCoordinatesTest.java  |   3 ---
 ...st-fv0.3.nc => nshmp-conus-test-fv.0.4.nc} | Bin 29092 -> 29313 bytes
 4 files changed, 1 insertion(+), 5 deletions(-)
 rename src/test/resources/{netcdf-conus-test-fv0.3.nc => nshmp-conus-test-fv.0.4.nc} (54%)

diff --git a/src/main/python/gov/usgs/earthquake/nshmp/netcdf/converters/convert.py b/src/main/python/gov/usgs/earthquake/nshmp/netcdf/converters/convert.py
index 3580b03..101013b 100644
--- a/src/main/python/gov/usgs/earthquake/nshmp/netcdf/converters/convert.py
+++ b/src/main/python/gov/usgs/earthquake/nshmp/netcdf/converters/convert.py
@@ -26,7 +26,6 @@ from ..utils.netcdf_utils import NetcdfUtils
 
 
 _ROOT_ATTRIBUTES: dict = {
-    "nshmpNetcdfFormatVersion": 0.3,
     "description": "NSHMP Probabilistic Seismic Hazard Curves.",
     "history": f"ASCII data converted ({datetime.now()})",
     "nshmpNetcdfFormatDescription": (
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java
index 70648ee..ba7661a 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/NshmNetcdfReaderTests.java
@@ -40,7 +40,7 @@ import gov.usgs.earthquake.nshmp.netcdf.reader.StaticHazards;
 
 public class NshmNetcdfReaderTests {
 
-  static final String CONUS_TEST_FILE = "netcdf-conus-test-fv0.3.nc";
+  static final String CONUS_TEST_FILE = "nshmp-conus-test-fv.0.4.nc";
   static final Path NETCDF_PATH = Paths.get(Resources.getResource(CONUS_TEST_FILE).getPath());
 
   static final String TEST_INVALID_NC_FILE = "invalid-netcdf-file.nc";
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfCoordinatesTest.java b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfCoordinatesTest.java
index 83e107a..0a07f17 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfCoordinatesTest.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/netcdf/reader/NetcdfCoordinatesTest.java
@@ -26,9 +26,6 @@ class NetcdfCoordinatesTest {
     assertEquals(NshmNetcdfReaderTests.SITE_CLASSES, coords.siteClasses());
 
     // Check region
-    var border = NetcdfUtils.buildBorder(
-        NshmNetcdfReaderTests.EXPECTED_LONGITUDES,
-        NshmNetcdfReaderTests.EXPECTED_LATITUDES);
     var expectedRegion = NshmNetcdfReaderTests.EXPECTED_REGION;
     var expectedBorder = expectedRegion.border();
 
diff --git a/src/test/resources/netcdf-conus-test-fv0.3.nc b/src/test/resources/nshmp-conus-test-fv.0.4.nc
similarity index 54%
rename from src/test/resources/netcdf-conus-test-fv0.3.nc
rename to src/test/resources/nshmp-conus-test-fv.0.4.nc
index 1cff28e4aabc1888e673b28fe86f0a8c4444e7af..3d1966c875908dba6b6c2a5d83e06a8456600750 100644
GIT binary patch
delta 5237
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

delta 4886
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

-- 
GitLab