corrected string variable handling

TomBlock · TomBlock · commit 2397d6ff4f12 · 2023-02-17T15:17:31.000+01:00
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/AMSR2SectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/AMSR2SectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import ucar.ma2.DataType;
@@ -52,7 +53,7 @@ List<Variable> getVariables() {
         variables.add(new VariableProxy("AMSR2_scanpos", DataType.SHORT, attributes));
 
         attributes = new ArrayList<>();
-        variables.add(new VariableProxy("AMSR2_upstreamfile", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy("AMSR2_upstreamfile", DataType.STRING, attributes), 48));
 
         attributes = new ArrayList<>();
         attributes.add(new Attribute(CF_FILL_VALUE_NAME, NetCDFUtils.getDefaultFillValue(short.class)));
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/ASCATSectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/ASCATSectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import ucar.ma2.DataType;
@@ -21,7 +22,7 @@ List<Variable> getVariables() {
         createCommonVariables(variables, "ASCAT_");
 
         ArrayList<Attribute> attributes = new ArrayList<>();
-        variables.add(new VariableProxy("ASCAT_upstreamfile", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy("ASCAT_upstreamfile", DataType.STRING, attributes), 32));
 
         attributes = new ArrayList<>();
         attributes.add(new Attribute(CF_FILL_VALUE_NAME, NetCDFUtils.getDefaultFillValue(float.class)));
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/AbstractSectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/AbstractSectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import org.esa.snap.core.datamodel.ProductData;
@@ -51,7 +52,7 @@ static void createCommonVariables(List<Variable> variables, String prefix) {
         variables.add(new VariableProxy(prefix + "time", DataType.INT, attributes));
 
         attributes = new ArrayList<>();
-        variables.add(new VariableProxy(prefix + "reference-id", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy(prefix + "reference-id", DataType.STRING, attributes), 32));
     }
 
     static Array parseFloat(String token) {
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/ERASectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/ERASectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import ucar.ma2.Array;
@@ -29,7 +30,7 @@ List<Variable> getVariables() {
         createCommonVariables(variables, prefix);
 
         ArrayList<Attribute> attributes = new ArrayList<>();
-        variables.add(new VariableProxy(prefix + "upstreamfile", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy(prefix + "upstreamfile", DataType.STRING, attributes), 16));
 
         attributes = new ArrayList<>();
         attributes.add(new Attribute(CF_FILL_VALUE_NAME, NetCDFUtils.getDefaultFillValue(float.class)));
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/QSCATSectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/QSCATSectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import ucar.ma2.DataType;
@@ -21,7 +22,7 @@ List<Variable> getVariables() {
         createCommonVariables(variables, "QSCAT_");
 
         ArrayList<Attribute> attributes = new ArrayList<>();
-        variables.add(new VariableProxy("QSCAT_upstreamfile", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy("QSCAT_upstreamfile", DataType.STRING, attributes), 32));
 
         attributes = new ArrayList<>();
         attributes.add(new Attribute(CF_FILL_VALUE_NAME, NetCDFUtils.getDefaultFillValue(float.class)));
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/SMAPSectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/SMAPSectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import ucar.ma2.DataType;
@@ -21,7 +22,7 @@ List<Variable> getVariables() {
         createCommonVariables(variables, "SMAP_");
 
         ArrayList<Attribute> attributes = new ArrayList<>();
-        variables.add(new VariableProxy("SMAP_upstreamfile", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy("SMAP_upstreamfile", DataType.STRING, attributes), 32));
 
         attributes = new ArrayList<>();
         attributes.add(new Attribute(CF_FILL_VALUE_NAME, NetCDFUtils.getDefaultFillValue(float.class)));
diff --git a/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/SMOSSectionParser.java b/core/src/main/java/com/bc/fiduceo/reader/insitu/sic_cci/SMOSSectionParser.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.reader.netcdf.StringVariable;
 import com.bc.fiduceo.util.NetCDFUtils;
 import com.bc.fiduceo.util.VariableProxy;
 import ucar.ma2.DataType;
@@ -21,7 +22,7 @@ List<Variable> getVariables() {
         createCommonVariables(variables, "SMOS_");
 
         ArrayList<Attribute> attributes = new ArrayList<>();
-        variables.add(new VariableProxy("SMOS_upstreamfile", DataType.CHAR, attributes));
+        variables.add(new StringVariable(new VariableProxy("SMOS_upstreamfile", DataType.STRING, attributes), 32));
 
         attributes = new ArrayList<>();
         attributes.add(new Attribute(CF_FILL_VALUE_NAME, NetCDFUtils.getDefaultFillValue(float.class)));
diff --git a/core/src/test/java/com/bc/fiduceo/NCTestUtils.java b/core/src/test/java/com/bc/fiduceo/NCTestUtils.java
@@ -242,4 +242,10 @@ public static void assert3DValueLong(int x, int y, int z, long expected, Variabl
     public static void assertDimensions(String dimensions, Variable variable) {
         assertEquals(dimensions, variable.getDimensionsString());
     }
+
+    public static void assertStringValue(Array array, String expected) {
+        final char[] valueAsArray = (char[]) array.get1DJavaArray(char.class);
+        assertEquals(expected, new String(valueAsArray).trim());
+
+    }
 }
diff --git a/core/src/test/java/com/bc/fiduceo/TestUtil.java b/core/src/test/java/com/bc/fiduceo/TestUtil.java
@@ -187,7 +187,7 @@ public static void writeMmdWriterConfig(File configDir) throws IOException {
     public static void writeMmdWriterConfig(File configDir, String additionalTags) throws IOException {
         final String config = "<mmd-writer-config>" +
                 "    <overwrite>false</overwrite>" +
-                "    <cache-size>2048</cache-size>" +
+                "    <cache-size>64</cache-size>" +
                 "    <netcdf-format>N4</netcdf-format>" +
                 additionalTags +
                 "</mmd-writer-config>";
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/AMSR2SectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/AMSR2SectionParserTest.java
@@ -76,7 +76,7 @@ public void testGetVariables() {
 
         variable = variables.get(21);
         assertEquals("AMSR2_upstreamfile", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(22);
         assertEquals("AMSR2_timediff", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ANTXXXISectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ANTXXXISectionParserTest.java
@@ -90,7 +90,7 @@ public void testGetVariables() {
 
         variable = variables.get(3);
         assertEquals("reference-id", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(4);
         assertEquals("SIC-total", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ASCATSectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ASCATSectionParserTest.java
@@ -33,7 +33,7 @@ public void testGetVariables() {
 
         variable = variables.get(4);
         assertEquals("ASCAT_upstreamfile", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(5);
         assertEquals("ASCAT_sigma_40", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/DMISIC0SectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/DMISIC0SectionParserTest.java
@@ -68,7 +68,7 @@ public void testGetVariables() {
 
         variable = variables.get(3);
         assertEquals("reference-id", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(4);
         assertEquals("SIC", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/DTUSIC1SectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/DTUSIC1SectionParserTest.java
@@ -69,7 +69,7 @@ public void testGetVariables() {
 
         variable = variables.get(3);
         assertEquals("reference-id", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(4);
         assertEquals("SIC", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ERASectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/ERASectionParserTest.java
@@ -1,5 +1,6 @@
 package com.bc.fiduceo.reader.insitu.sic_cci;
 
+import com.bc.fiduceo.NCTestUtils;
 import org.junit.Test;
 import ucar.ma2.Array;
 import ucar.ma2.DataType;
@@ -26,7 +27,7 @@ public void testGetVariables_ERA() {
 
         variable = variables.get(4);
         assertEquals("ERA_upstreamfile", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(6);
         assertEquals("ERA_u10", variable.getShortName());
@@ -151,12 +152,10 @@ public void testParse_ERA5() throws ParseException {
         assertEquals(1514908800, section.get("ERA5_time").getInt(0));
 
         Array refId = section.get("ERA5_reference-id");
-        char[] valueAsArray = (char[]) refId.get1DJavaArray(DataType.CHAR);
-        assertEquals("ERA5_ECMWF", new String(valueAsArray));
+        NCTestUtils.assertStringValue(refId, "ERA5_ECMWF");
 
         refId = section.get("ERA5_upstreamfile");
-        valueAsArray = (char[]) refId.get1DJavaArray(DataType.CHAR);
-        assertEquals("201801era5.nc", new String(valueAsArray));
+        NCTestUtils.assertStringValue(refId, "201801era5.nc");
 
         assertEquals(994.4f, section.get("ERA5_msl").getFloat(0), 1e-8);
         assertEquals(-7.38f, section.get("ERA5_u10").getFloat(0), 1e-8);
@@ -200,12 +199,10 @@ public void testParse_ERA() throws ParseException {
         assertEquals(1450083600, section.get("ERA_time").getInt(0));
 
         Array refId = section.get("ERA_reference-id");
-        char[] valueAsArray = (char[]) refId.get1DJavaArray(DataType.CHAR);
-        assertEquals("NWP_ECMWF", new String(valueAsArray));
+        NCTestUtils.assertStringValue(refId, "NWP_ECMWF");
 
         refId = section.get("ERA_upstreamfile");
-        valueAsArray = (char[]) refId.get1DJavaArray(DataType.CHAR);
-        assertEquals("2015q4.nc", new String(valueAsArray));
+        NCTestUtils.assertStringValue(refId, "2015q4.nc");
 
         assertEquals(984.1f, section.get("ERA_msl").getFloat(0), 1e-8);
         assertEquals(-5.67f, section.get("ERA_u10").getFloat(0), 1e-8);
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/QSCATSectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/QSCATSectionParserTest.java
@@ -33,7 +33,7 @@ public void testGetVariables() {
 
         variable = variables.get(4);
         assertEquals("QSCAT_upstreamfile", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(5);
         assertEquals("QSCAT_sigma0_inner", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/SMAPSectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/SMAPSectionParserTest.java
@@ -34,7 +34,7 @@ public void testGetVariables() {
 
         variable = variables.get(4);
         assertEquals("SMAP_upstreamfile", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(5);
         assertEquals("SMAP_Tbv", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/SMOSSectionParserTest.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/SMOSSectionParserTest.java
@@ -33,7 +33,7 @@ public void testGetVariables() {
 
         variable = variables.get(4);
         assertEquals("SMOS_upstreamfile", variable.getShortName());
-        assertEquals(DataType.CHAR, variable.getDataType());
+        assertEquals(DataType.STRING, variable.getDataType());
 
         variable = variables.get(5);
         assertEquals("SMOS_Tbv", variable.getShortName());
diff --git a/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/SciCciInsituReader_IO_Test.java b/core/src/test/java/com/bc/fiduceo/reader/insitu/sic_cci/SciCciInsituReader_IO_Test.java
@@ -335,6 +335,20 @@ public void testReadRaw_1x1_DMISIC0() throws InvalidRangeException, IOException
         }
     }
 
+    @Test
+    public void testReadRaw_String_DMISIC0() throws InvalidRangeException, IOException {
+        final File testFile = getDMISIC0();
+
+        try {
+            reader.open(testFile);
+
+            final Array array = reader.readRaw(6, 3, new Interval(1, 1), "AMSR2_upstreamfile");
+            NCTestUtils.assertStringValue(array, "GW1AM2_201601010343_218D_L1SGRTBR_2210210.h5");
+        } finally {
+            reader.close();
+        }
+    }
+
     @Test
     public void testReadRaw_1x1_DTUSIC1() throws InvalidRangeException, IOException {
         final File testFile = getDTUSIC1();
@@ -364,6 +378,19 @@ public void testReadRaw_1x1_DTUSIC1() throws InvalidRangeException, IOException
         }
     }
 
+    @Test
+    public void testReadRaw_string_DTUSIC1() throws InvalidRangeException, IOException {
+        final File testFile = getDTUSIC1();
+
+        try {
+            reader.open(testFile);
+            final Array array = reader.readRaw(5, 7, new Interval(1, 1), "ASCAT_upstreamfile");
+            NCTestUtils.assertStringValue(array, "ASCAT_A_B_20170130.nc");
+        } finally {
+            reader.close();
+        }
+    }
+
     @Test
     public void testReadRaw_1x1_DTUSIC1_SMOS_SMAP() throws InvalidRangeException, IOException {
         final File testFile = getDTUSIC1_SMOS_SMAP();
diff --git a/matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_Windsat_sic_cci.java b/matchup-tool/src/test/java/com/bc/fiduceo/matchup/MatchupToolIntegrationTest_Windsat_sic_cci.java
@@ -9,6 +9,7 @@
 import com.bc.fiduceo.db.DbAndIOTestRunner;
 import com.bc.fiduceo.util.NetCDFUtils;
 import org.apache.commons.cli.ParseException;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import ucar.ma2.InvalidRangeException;
@@ -28,7 +29,7 @@ public class MatchupToolIntegrationTest_Windsat_sic_cci extends AbstractUsecaseI
 
     @Test
     public void testMatchup() throws IOException, SQLException, ParseException, InvalidRangeException {
-        final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder()
+        final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder("DMISIC0-sic-cci")
                 .withTimeDeltaSeconds(28800, null)
                 .withMaxPixelDistanceKm(8, null)
                 .createConfig();
@@ -37,11 +38,9 @@ public void testMatchup() throws IOException, SQLException, ParseException, Inva
         insert_SIC_CCI();
         insert_windsat();
 
-
         final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2018-118", "-end", "2018-120"};
         MatchupToolMain.main(args);
 
-
         final File mmdFile = getMmdFilePath(useCaseConfig, "2018-118", "2018-120");
         assertTrue(mmdFile.isFile());
         try (NetcdfFile mmd = NetcdfFile.open(mmdFile.getAbsolutePath())) {
@@ -91,6 +90,31 @@ public void testMatchup() throws IOException, SQLException, ParseException, Inva
         }
     }
 
+    @Test
+    @Ignore
+    public void test_oome_crash() throws IOException, SQLException, ParseException {
+        final UseCaseConfig useCaseConfig = createUseCaseConfigBuilder("DTUSIC1-sic-cci")
+                .withTimeDeltaSeconds(86400, null)
+                .withMaxPixelDistanceKm(14, null)
+                .createConfig();
+        final File useCaseConfigFile = storeUseCaseConfig(useCaseConfig, "usecase-45.xml");
+
+        insert_DTU_SIC_CCI("ASCAT-vs-AMSR2-vs-ERA5-vs-DTUSIC1-2018-S.text");
+        insert_DTU_SIC_CCI("ASCAT-vs-AMSR2-vs-ERA5-vs-DTUSIC1-2018-N.text");
+
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81462_20180930T055123_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81465_20180930T105600_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81466_20180930T123732_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81467_20180930T141905_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81468_20180930T160038_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81469_20180930T174209_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81470_20180930T192342_2018273_V08.0.nc");
+        insert_windsat_MD("09", "30", "RSS_WindSat_TB_L1C_r81471_20180930T210513_2018273_V08.0.nc");
+
+        final String[] args = new String[]{"-c", configDir.getAbsolutePath(), "-u", useCaseConfigFile.getName(), "-start", "2018-274", "-end", "2018-274"};
+        MatchupToolMain.main(args);
+    }
+
     private void insert_SIC_CCI() throws IOException, SQLException {
         final String sensorKey = "DMISIC0-sic-cci";
         final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{"insitu", "sic-cci", sensorKey, "v3", "ASCAT-vs-AMSR2-vs-ERA5-vs-DMISIC0-2018-N.text"}, true);
@@ -107,15 +131,31 @@ private void insert_windsat() throws IOException, SQLException {
         storage.insert(satelliteObservation);
     }
 
-    private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder() {
+    private void insert_DTU_SIC_CCI(String fileName) throws IOException, SQLException {
+        final String sensorKey = "DTUSIC1-sic-cci";
+        final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{"insitu", "sic-cci", sensorKey, "v3", fileName}, true);
+
+        final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v3");
+        storage.insert(satelliteObservation);
+    }
+
+    private void insert_windsat_MD(String month, String day, String filename) throws IOException, SQLException {
+        final String sensorKey = "windsat-coriolis";
+        final String relativeArchivePath = TestUtil.assembleFileSystemPath(new String[]{sensorKey, "v1.0", "2018", month, day, filename}, true);
+
+        final SatelliteObservation satelliteObservation = readSatelliteObservation(sensorKey, relativeArchivePath, "v1.0");
+        storage.insert(satelliteObservation);
+    }
+
+    private MatchupToolTestUseCaseConfigBuilder createUseCaseConfigBuilder(String insituName) {
         final List<Sensor> sensorList = new ArrayList<>();
-        final Sensor primary = new Sensor("DMISIC0-sic-cci");
+        final Sensor primary = new Sensor(insituName);
         primary.setPrimary(true);
         sensorList.add(primary);
         sensorList.add(new Sensor("windsat-coriolis"));
 
         final List<com.bc.fiduceo.core.Dimension> dimensions = new ArrayList<>();
-        dimensions.add(new com.bc.fiduceo.core.Dimension("DMISIC0-sic-cci", 1, 1));
+        dimensions.add(new com.bc.fiduceo.core.Dimension(insituName, 1, 1));
         dimensions.add(new com.bc.fiduceo.core.Dimension("windsat-coriolis", 3, 3));
 
         return (MatchupToolTestUseCaseConfigBuilder) new MatchupToolTestUseCaseConfigBuilder("mmd45")

Original file line number	Diff line number	Diff line change
`@@ -242,4 +242,10 @@ public static void assert3DValueLong(int x, int y, int z, long expected, Variabl`
`242`	`242`	`public static void assertDimensions(String dimensions, Variable variable) {`
`243`	`243`	`assertEquals(dimensions, variable.getDimensionsString());`
`244`	`244`	`}`
	`245`	`+`
	`246`	`+ public static void assertStringValue(Array array, String expected) {`
	`247`	`+ final char[] valueAsArray = (char[]) array.get1DJavaArray(char.class);`
	`248`	`+ assertEquals(expected, new String(valueAsArray).trim());`
	`249`	`+`
	`250`	`+ }`
`245`	`251`	`}`