bcdev
diff --git a/‎core/src/test/java/com/bc/fiduceo/util/NetCDFUtilsTest.java‎
Lines changed: 6 additions & 0 deletions b/‎core/src/test/java/com/bc/fiduceo/util/NetCDFUtilsTest.java‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFields.java‎
Lines changed: 3 additions & 3 deletions b/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFields.java‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFieldsConfiguration.java‎
Lines changed: 15 additions & 16 deletions b/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFieldsConfiguration.java‎
Lines changed: 15 additions & 16 deletions
diff --git a/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java‎
Lines changed: 4 additions & 4 deletions b/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFields.java‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFieldsConfiguration.java‎
Lines changed: 20 additions & 20 deletions b/‎post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/SatelliteFieldsConfiguration.java‎
Lines changed: 20 additions & 20 deletions
@@ -424,6 +424,12 @@ public void testGetVariable_writer_variableNotPresent() {
         }
     }
 
+    @Test
+    public void testEscapeVariableName() {
+        assertEquals("hansematz", NetCDFUtils.escapeVariableName("hansematz"));
+        assertEquals("hans\\.ematz", NetCDFUtils.escapeVariableName("hans.ematz"));
+    }
+
     @Test
     public void testGetAttributeInt_attributeValue() {
         final Attribute attribute = mock(Attribute.class);
 
@@ -141,7 +141,7 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                 }
 
                 final TemplateVariable templateVariable = variables.get(variableKey);
-                final Variable targetVariable = writer.findVariable(templateVariable.getName());
+                final Variable targetVariable = writer.findVariable(NetCDFUtils.escapeVariableName(templateVariable.getName()));
                 writer.write(targetVariable, targetArray);
             }
         } finally {
@@ -151,8 +151,8 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
 
     private void addTimeVariable(MatchupFieldsConfiguration matchupFieldsConfig, List<Dimension> dimensions, NetcdfFileWriter writer) {
         final String timeVariableName = matchupFieldsConfig.get_nwp_time_variable_name();
-        final String escapedName = NetCDFUtils.escapeVariableName(timeVariableName);
-        final Variable variable = writer.addVariable(escapedName, DataType.INT, dimensions);
+//        final String escapedName = NetCDFUtils.escapeVariableName(timeVariableName);
+        final Variable variable = writer.addVariable(timeVariableName, DataType.INT, dimensions);
         variable.addAttribute(new Attribute("description", "Timestamp of ERA-5 data"));
         variable.addAttribute(new Attribute("units", "seconds since 1970-01-01"));
         variable.addAttribute(new Attribute("_FillValue", NetCDFUtils.getDefaultFillValue(DataType.INT, false)));
 
@@ -1,6 +1,5 @@
 package com.bc.fiduceo.post.plugin.era5;
 
-import com.bc.fiduceo.util.NetCDFUtils;
 import org.esa.snap.core.util.StringUtils;
 
 class MatchupFieldsConfiguration {
@@ -50,79 +49,79 @@ String get_an_u10_name() {
     }
 
     void set_an_u10_name(String an_u10_name) {
-        this.an_u10_name = NetCDFUtils.escapeVariableName(an_u10_name);
+        this.an_u10_name = an_u10_name;
     }
 
     String get_an_v10_name() {
         return an_v10_name;
     }
 
     void set_an_v10_name(String an_v10_name) {
-        this.an_v10_name = NetCDFUtils.escapeVariableName(an_v10_name);
+        this.an_v10_name = an_v10_name;
     }
 
     String get_an_siconc_name() {
         return an_siconc_name;
     }
 
     void set_an_siconc_name(String an_siconc_name) {
-        this.an_siconc_name = NetCDFUtils.escapeVariableName(an_siconc_name);
+        this.an_siconc_name = an_siconc_name;
     }
 
     String get_an_sst_name() {
         return an_sst_name;
     }
 
     void set_an_sst_name(String an_sst_name) {
-        this.an_sst_name = NetCDFUtils.escapeVariableName(an_sst_name);
+        this.an_sst_name = an_sst_name;
     }
 
     String get_fc_metss_name() {
         return fc_metss_name;
     }
 
     void set_fc_metss_name(String fc_metss_name) {
-        this.fc_metss_name = NetCDFUtils.escapeVariableName(fc_metss_name);
+        this.fc_metss_name = fc_metss_name;
     }
 
     String get_fc_mntss_name() {
         return fc_mntss_name;
     }
 
     void set_fc_mntss_name(String fc_mntss_name) {
-        this.fc_mntss_name = NetCDFUtils.escapeVariableName(fc_mntss_name);
+        this.fc_mntss_name = fc_mntss_name;
     }
 
     String get_fc_mslhf_name() {
         return fc_mslhf_name;
     }
 
     void set_fc_mslhf_name(String fc_mslhf_name) {
-        this.fc_mslhf_name = NetCDFUtils.escapeVariableName(fc_mslhf_name);
+        this.fc_mslhf_name = fc_mslhf_name;
     }
 
     String get_fc_msnlwrf_name() {
         return fc_msnlwrf_name;
     }
 
     void set_fc_msnlwrf_name(String fc_msnlwrf_name) {
-        this.fc_msnlwrf_name = NetCDFUtils.escapeVariableName(fc_msnlwrf_name);
+        this.fc_msnlwrf_name = fc_msnlwrf_name;
     }
 
     String get_fc_msnswrf_name() {
         return fc_msnswrf_name;
     }
 
     void set_fc_msnswrf_name(String fc_msnswrf_name) {
-        this.fc_msnswrf_name = NetCDFUtils.escapeVariableName(fc_msnswrf_name);
+        this.fc_msnswrf_name = fc_msnswrf_name;
     }
 
     String get_fc_msshf_name() {
         return fc_msshf_name;
     }
 
     void set_fc_msshf_name(String fc_msshf_name) {
-        this.fc_msshf_name = NetCDFUtils.escapeVariableName(fc_msshf_name);
+        this.fc_msshf_name = fc_msshf_name;
     }
 
     int get_time_steps_past() {
@@ -146,39 +145,39 @@ String get_time_dim_name() {
     }
 
     void set_time_dim_name(String time_dim_name) {
-        this.time_dim_name = NetCDFUtils.escapeVariableName(time_dim_name);
+        this.time_dim_name = time_dim_name;
     }
 
     String get_time_variable_name() {
         return time_variable_name;
     }
 
     void set_time_variable_name(String time_variable_name) {
-        this.time_variable_name = NetCDFUtils.escapeVariableName(time_variable_name);
+        this.time_variable_name = time_variable_name;
     }
 
     String get_longitude_variable_name() {
         return longitude_variable_name;
     }
 
     void set_longitude_variable_name(String longitude_variable_name) {
-        this.longitude_variable_name = NetCDFUtils.escapeVariableName(longitude_variable_name);
+        this.longitude_variable_name = longitude_variable_name;
     }
 
     String get_latitude_variable_name() {
         return latitude_variable_name;
     }
 
     void set_latitude_variable_name(String latitude_variable_name) {
-        this.latitude_variable_name = NetCDFUtils.escapeVariableName(latitude_variable_name);
+        this.latitude_variable_name = latitude_variable_name;
     }
 
     String get_nwp_time_variable_name() {
         return nwp_time_variable_name;
     }
 
     void set_nwp_time_variable_name(String nwp_time_variable_name) {
-        this.nwp_time_variable_name = NetCDFUtils.escapeVariableName(nwp_time_variable_name);
+        this.nwp_time_variable_name = nwp_time_variable_name;
     }
 
     boolean verify() {
 
@@ -191,7 +191,8 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
             // + write to MMD
             final Array timeArray = VariableUtils.readTimeArray(satFieldsConfig.get_time_variable_name(), reader);
             final Array era5TimeArray = convertToEra5TimeStamp(timeArray);
-            writer.write(satFieldsConfig.get_nwp_time_variable_name(), era5TimeArray);
+            final Variable targetTimeVariable = NetCDFUtils.getVariable(writer, satFieldsConfig.get_nwp_time_variable_name());
+            writer.write(targetTimeVariable, era5TimeArray);
 
             // open longitude and latitude input variables
             // + read completely or specified x/y subset
@@ -302,7 +303,7 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                     }
 
                     final TemplateVariable templateVariable = variables.get(variableKey);
-                    final Variable targetVariable = writer.findVariable(templateVariable.getName());
+                    final Variable targetVariable = writer.findVariable(NetCDFUtils.escapeVariableName(templateVariable.getName()));
                     writer.write(targetVariable, targetArray);
                 }
             }
@@ -313,8 +314,7 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
 
     private void addTimeVariable(SatelliteFieldsConfiguration satFieldsConfig, NetcdfFileWriter writer) {
         final String nwp_time_variable_name = satFieldsConfig.get_nwp_time_variable_name();
-        final String escapedName = NetCDFUtils.escapeVariableName(nwp_time_variable_name);
-        final Variable variable = writer.addVariable(escapedName, DataType.INT, FiduceoConstants.MATCHUP_COUNT);
+        final Variable variable = writer.addVariable(nwp_time_variable_name, DataType.INT, FiduceoConstants.MATCHUP_COUNT);
         variable.addAttribute(new Attribute("description", "Timestamp of ERA-5 data"));
         variable.addAttribute(new Attribute("units", "seconds since 1970-01-01"));
         variable.addAttribute(new Attribute("_FillValue", NetCDFUtils.getDefaultFillValue(DataType.INT, false)));
 
@@ -56,103 +56,103 @@ String get_an_q_name() {
     }
 
     void set_an_q_name(String an_q_name) {
-        this.an_q_name = NetCDFUtils.escapeVariableName(an_q_name);
+        this.an_q_name = an_q_name;
     }
 
     String get_an_t_name() {
         return an_t_name;
     }
 
     void set_an_t_name(String an_t_name) {
-        this.an_t_name = NetCDFUtils.escapeVariableName(an_t_name);
+        this.an_t_name = an_t_name;
     }
 
     String get_an_o3_name() {
         return an_o3_name;
     }
 
     void set_an_o3_name(String an_o3_name) {
-        this.an_o3_name = NetCDFUtils.escapeVariableName(an_o3_name);
+        this.an_o3_name = an_o3_name;
     }
 
     String get_an_lnsp_name() {
         return an_lnsp_name;
     }
 
     void set_an_lnsp_name(String an_lnsp_name) {
-        this.an_lnsp_name = NetCDFUtils.escapeVariableName(an_lnsp_name);
+        this.an_lnsp_name = an_lnsp_name;
     }
 
     String get_an_t2m_name() {
         return an_t2m_name;
     }
 
     void set_an_t2m_name(String an_t2m_name) {
-        this.an_t2m_name = NetCDFUtils.escapeVariableName(an_t2m_name);
+        this.an_t2m_name = an_t2m_name;
     }
 
     String get_an_siconc_name() {
         return an_siconc_name;
     }
 
     void set_an_siconc_name(String an_siconc_name) {
-        this.an_siconc_name = NetCDFUtils.escapeVariableName(an_siconc_name);
+        this.an_siconc_name = an_siconc_name;
     }
 
     String get_an_u10_name() {
         return an_u10_name;
     }
 
     void set_an_u10_name(String an_u10_name) {
-        this.an_u10_name = NetCDFUtils.escapeVariableName(an_u10_name);
+        this.an_u10_name = an_u10_name;
     }
 
     String get_an_v10_name() {
         return an_v10_name;
     }
 
     void set_an_v10_name(String an_v10_name) {
-        this.an_v10_name = NetCDFUtils.escapeVariableName(an_v10_name);
+        this.an_v10_name = an_v10_name;
     }
 
     String get_an_msl_name() {
         return an_msl_name;
     }
 
     void set_an_msl_name(String an_msl_name) {
-        this.an_msl_name = NetCDFUtils.escapeVariableName(an_msl_name);
+        this.an_msl_name = an_msl_name;
     }
 
     String get_an_skt_name() {
         return an_skt_name;
     }
 
     void set_an_skt_name(String an_skt_name) {
-        this.an_skt_name = NetCDFUtils.escapeVariableName(an_skt_name);
+        this.an_skt_name = an_skt_name;
     }
 
     String get_an_sst_name() {
         return an_sst_name;
     }
 
     void set_an_sst_name(String an_sst_name) {
-        this.an_sst_name = NetCDFUtils.escapeVariableName(an_sst_name);
+        this.an_sst_name = an_sst_name;
     }
 
     String get_an_tcc_name() {
         return an_tcc_name;
     }
 
     void set_an_tcc_name(String an_tcc_name) {
-        this.an_tcc_name = NetCDFUtils.escapeVariableName(an_tcc_name);
+        this.an_tcc_name = an_tcc_name;
     }
 
     String get_an_tcwv_name() {
         return an_tcwv_name;
     }
 
     void set_an_tcwv_name(String an_tcwv_name) {
-        this.an_tcwv_name = NetCDFUtils.escapeVariableName(an_tcwv_name);
+        this.an_tcwv_name = an_tcwv_name;
     }
 
     int get_x_dim() {
@@ -184,55 +184,55 @@ String get_x_dim_name() {
     }
 
     void set_x_dim_name(String x_dim_name) {
-        this.x_dim_name = NetCDFUtils.escapeVariableName(x_dim_name);
+        this.x_dim_name = x_dim_name;
     }
 
     String get_y_dim_name() {
         return y_dim_name;
     }
 
     void set_y_dim_name(String y_dim_name) {
-        this.y_dim_name = NetCDFUtils.escapeVariableName(y_dim_name);
+        this.y_dim_name = y_dim_name;
     }
 
     String get_z_dim_name() {
         return z_dim_name;
     }
 
     void set_z_dim_name(String z_dim_name) {
-        this.z_dim_name = NetCDFUtils.escapeVariableName(z_dim_name);
+        this.z_dim_name = z_dim_name;
     }
 
     String get_nwp_time_variable_name() {
         return nwp_time_variable_name;
     }
 
     void set_nwp_time_variable_name(String nwp_time_variable_name) {
-        this.nwp_time_variable_name = NetCDFUtils.escapeVariableName(nwp_time_variable_name);
+        this.nwp_time_variable_name =nwp_time_variable_name;
     }
 
     String get_time_variable_name() {
         return time_variable_name;
     }
 
     void set_time_variable_name(String time_variable_name) {
-        this.time_variable_name = NetCDFUtils.escapeVariableName(time_variable_name);
+        this.time_variable_name = time_variable_name;
     }
 
     String get_longitude_variable_name() {
         return longitude_variable_name;
     }
 
     void set_longitude_variable_name(String longitude_variable_name) {
-        this.longitude_variable_name = NetCDFUtils.escapeVariableName(longitude_variable_name);
+        this.longitude_variable_name = longitude_variable_name;
     }
 
     String get_latitude_variable_name() {
         return latitude_variable_name;
     }
 
     void set_latitude_variable_name(String latitude_variable_name) {
-        this.latitude_variable_name = NetCDFUtils.escapeVariableName(latitude_variable_name);
+        this.latitude_variable_name = latitude_variable_name;
     }
Original file line number	Diff line number	Diff line change
`@@ -424,6 +424,12 @@ public void testGetVariable_writer_variableNotPresent() {`
`424`	`424`	`}`
`425`	`425`	`}`
`426`	`426`
	`427`	`+ @Test`
	`428`	`+ public void testEscapeVariableName() {`
	`429`	`+ assertEquals("hansematz", NetCDFUtils.escapeVariableName("hansematz"));`
	`430`	`+ assertEquals("hans\\.ematz", NetCDFUtils.escapeVariableName("hans.ematz"));`
	`431`	`+ }`
	`432`	`+`
`427`	`433`	`@Test`
`428`	`434`	`public void testGetAttributeInt_attributeValue() {`
`429`	`435`	`final Attribute attribute = mock(Attribute.class);`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`package com.bc.fiduceo.post.plugin.era5;`
`2`	`2`
`3`		`-import com.bc.fiduceo.util.NetCDFUtils;`
`4`	`3`	`import org.esa.snap.core.util.StringUtils;`
`5`	`4`
`6`	`5`	`class MatchupFieldsConfiguration {`
`@@ -50,79 +49,79 @@ String get_an_u10_name() {`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`void set_an_u10_name(String an_u10_name) {`
`53`		`- this.an_u10_name = NetCDFUtils.escapeVariableName(an_u10_name);`
	`52`	`+ this.an_u10_name = an_u10_name;`
`54`	`53`	`}`
`55`	`54`
`56`	`55`	`String get_an_v10_name() {`
`57`	`56`	`return an_v10_name;`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`void set_an_v10_name(String an_v10_name) {`
`61`		`- this.an_v10_name = NetCDFUtils.escapeVariableName(an_v10_name);`
	`60`	`+ this.an_v10_name = an_v10_name;`
`62`	`61`	`}`
`63`	`62`
`64`	`63`	`String get_an_siconc_name() {`
`65`	`64`	`return an_siconc_name;`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`void set_an_siconc_name(String an_siconc_name) {`
`69`		`- this.an_siconc_name = NetCDFUtils.escapeVariableName(an_siconc_name);`
	`68`	`+ this.an_siconc_name = an_siconc_name;`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`String get_an_sst_name() {`
`73`	`72`	`return an_sst_name;`
`74`	`73`	`}`
`75`	`74`
`76`	`75`	`void set_an_sst_name(String an_sst_name) {`
`77`		`- this.an_sst_name = NetCDFUtils.escapeVariableName(an_sst_name);`
	`76`	`+ this.an_sst_name = an_sst_name;`
`78`	`77`	`}`
`79`	`78`
`80`	`79`	`String get_fc_metss_name() {`
`81`	`80`	`return fc_metss_name;`
`82`	`81`	`}`
`83`	`82`
`84`	`83`	`void set_fc_metss_name(String fc_metss_name) {`
`85`		`- this.fc_metss_name = NetCDFUtils.escapeVariableName(fc_metss_name);`
	`84`	`+ this.fc_metss_name = fc_metss_name;`
`86`	`85`	`}`
`87`	`86`
`88`	`87`	`String get_fc_mntss_name() {`
`89`	`88`	`return fc_mntss_name;`
`90`	`89`	`}`
`91`	`90`
`92`	`91`	`void set_fc_mntss_name(String fc_mntss_name) {`
`93`		`- this.fc_mntss_name = NetCDFUtils.escapeVariableName(fc_mntss_name);`
	`92`	`+ this.fc_mntss_name = fc_mntss_name;`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`String get_fc_mslhf_name() {`
`97`	`96`	`return fc_mslhf_name;`
`98`	`97`	`}`
`99`	`98`
`100`	`99`	`void set_fc_mslhf_name(String fc_mslhf_name) {`
`101`		`- this.fc_mslhf_name = NetCDFUtils.escapeVariableName(fc_mslhf_name);`
	`100`	`+ this.fc_mslhf_name = fc_mslhf_name;`
`102`	`101`	`}`
`103`	`102`
`104`	`103`	`String get_fc_msnlwrf_name() {`
`105`	`104`	`return fc_msnlwrf_name;`
`106`	`105`	`}`
`107`	`106`
`108`	`107`	`void set_fc_msnlwrf_name(String fc_msnlwrf_name) {`
`109`		`- this.fc_msnlwrf_name = NetCDFUtils.escapeVariableName(fc_msnlwrf_name);`
	`108`	`+ this.fc_msnlwrf_name = fc_msnlwrf_name;`
`110`	`109`	`}`
`111`	`110`
`112`	`111`	`String get_fc_msnswrf_name() {`
`113`	`112`	`return fc_msnswrf_name;`
`114`	`113`	`}`
`115`	`114`
`116`	`115`	`void set_fc_msnswrf_name(String fc_msnswrf_name) {`
`117`		`- this.fc_msnswrf_name = NetCDFUtils.escapeVariableName(fc_msnswrf_name);`
	`116`	`+ this.fc_msnswrf_name = fc_msnswrf_name;`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`String get_fc_msshf_name() {`
`121`	`120`	`return fc_msshf_name;`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`void set_fc_msshf_name(String fc_msshf_name) {`
`125`		`- this.fc_msshf_name = NetCDFUtils.escapeVariableName(fc_msshf_name);`
	`124`	`+ this.fc_msshf_name = fc_msshf_name;`
`126`	`125`	`}`
`127`	`126`
`128`	`127`	`int get_time_steps_past() {`
`@@ -146,39 +145,39 @@ String get_time_dim_name() {`
`146`	`145`	`}`
`147`	`146`
`148`	`147`	`void set_time_dim_name(String time_dim_name) {`
`149`		`- this.time_dim_name = NetCDFUtils.escapeVariableName(time_dim_name);`
	`148`	`+ this.time_dim_name = time_dim_name;`
`150`	`149`	`}`
`151`	`150`
`152`	`151`	`String get_time_variable_name() {`
`153`	`152`	`return time_variable_name;`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`void set_time_variable_name(String time_variable_name) {`
`157`		`- this.time_variable_name = NetCDFUtils.escapeVariableName(time_variable_name);`
	`156`	`+ this.time_variable_name = time_variable_name;`
`158`	`157`	`}`
`159`	`158`
`160`	`159`	`String get_longitude_variable_name() {`
`161`	`160`	`return longitude_variable_name;`
`162`	`161`	`}`
`163`	`162`
`164`	`163`	`void set_longitude_variable_name(String longitude_variable_name) {`
`165`		`- this.longitude_variable_name = NetCDFUtils.escapeVariableName(longitude_variable_name);`
	`164`	`+ this.longitude_variable_name = longitude_variable_name;`
`166`	`165`	`}`
`167`	`166`
`168`	`167`	`String get_latitude_variable_name() {`
`169`	`168`	`return latitude_variable_name;`
`170`	`169`	`}`
`171`	`170`
`172`	`171`	`void set_latitude_variable_name(String latitude_variable_name) {`
`173`		`- this.latitude_variable_name = NetCDFUtils.escapeVariableName(latitude_variable_name);`
	`172`	`+ this.latitude_variable_name = latitude_variable_name;`
`174`	`173`	`}`
`175`	`174`
`176`	`175`	`String get_nwp_time_variable_name() {`
`177`	`176`	`return nwp_time_variable_name;`
`178`	`177`	`}`
`179`	`178`
`180`	`179`	`void set_nwp_time_variable_name(String nwp_time_variable_name) {`
`181`		`- this.nwp_time_variable_name = NetCDFUtils.escapeVariableName(nwp_time_variable_name);`
	`180`	`+ this.nwp_time_variable_name = nwp_time_variable_name;`
`182`	`181`	`}`
`183`	`182`
`184`	`183`	`boolean verify() {`
Original file line number	Diff line number	Diff line change
`@@ -56,103 +56,103 @@ String get_an_q_name() {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`void set_an_q_name(String an_q_name) {`
`59`		`- this.an_q_name = NetCDFUtils.escapeVariableName(an_q_name);`
	`59`	`+ this.an_q_name = an_q_name;`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`String get_an_t_name() {`
`63`	`63`	`return an_t_name;`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`void set_an_t_name(String an_t_name) {`
`67`		`- this.an_t_name = NetCDFUtils.escapeVariableName(an_t_name);`
	`67`	`+ this.an_t_name = an_t_name;`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`String get_an_o3_name() {`
`71`	`71`	`return an_o3_name;`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`void set_an_o3_name(String an_o3_name) {`
`75`		`- this.an_o3_name = NetCDFUtils.escapeVariableName(an_o3_name);`
	`75`	`+ this.an_o3_name = an_o3_name;`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`String get_an_lnsp_name() {`
`79`	`79`	`return an_lnsp_name;`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`void set_an_lnsp_name(String an_lnsp_name) {`
`83`		`- this.an_lnsp_name = NetCDFUtils.escapeVariableName(an_lnsp_name);`
	`83`	`+ this.an_lnsp_name = an_lnsp_name;`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`String get_an_t2m_name() {`
`87`	`87`	`return an_t2m_name;`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`void set_an_t2m_name(String an_t2m_name) {`
`91`		`- this.an_t2m_name = NetCDFUtils.escapeVariableName(an_t2m_name);`
	`91`	`+ this.an_t2m_name = an_t2m_name;`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`String get_an_siconc_name() {`
`95`	`95`	`return an_siconc_name;`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`void set_an_siconc_name(String an_siconc_name) {`
`99`		`- this.an_siconc_name = NetCDFUtils.escapeVariableName(an_siconc_name);`
	`99`	`+ this.an_siconc_name = an_siconc_name;`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`String get_an_u10_name() {`
`103`	`103`	`return an_u10_name;`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`void set_an_u10_name(String an_u10_name) {`
`107`		`- this.an_u10_name = NetCDFUtils.escapeVariableName(an_u10_name);`
	`107`	`+ this.an_u10_name = an_u10_name;`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`String get_an_v10_name() {`
`111`	`111`	`return an_v10_name;`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`void set_an_v10_name(String an_v10_name) {`
`115`		`- this.an_v10_name = NetCDFUtils.escapeVariableName(an_v10_name);`
	`115`	`+ this.an_v10_name = an_v10_name;`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`String get_an_msl_name() {`
`119`	`119`	`return an_msl_name;`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`void set_an_msl_name(String an_msl_name) {`
`123`		`- this.an_msl_name = NetCDFUtils.escapeVariableName(an_msl_name);`
	`123`	`+ this.an_msl_name = an_msl_name;`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`String get_an_skt_name() {`
`127`	`127`	`return an_skt_name;`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`void set_an_skt_name(String an_skt_name) {`
`131`		`- this.an_skt_name = NetCDFUtils.escapeVariableName(an_skt_name);`
	`131`	`+ this.an_skt_name = an_skt_name;`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`String get_an_sst_name() {`
`135`	`135`	`return an_sst_name;`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`void set_an_sst_name(String an_sst_name) {`
`139`		`- this.an_sst_name = NetCDFUtils.escapeVariableName(an_sst_name);`
	`139`	`+ this.an_sst_name = an_sst_name;`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`String get_an_tcc_name() {`
`143`	`143`	`return an_tcc_name;`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`void set_an_tcc_name(String an_tcc_name) {`
`147`		`- this.an_tcc_name = NetCDFUtils.escapeVariableName(an_tcc_name);`
	`147`	`+ this.an_tcc_name = an_tcc_name;`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`String get_an_tcwv_name() {`
`151`	`151`	`return an_tcwv_name;`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`void set_an_tcwv_name(String an_tcwv_name) {`
`155`		`- this.an_tcwv_name = NetCDFUtils.escapeVariableName(an_tcwv_name);`
	`155`	`+ this.an_tcwv_name = an_tcwv_name;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`int get_x_dim() {`
`@@ -184,55 +184,55 @@ String get_x_dim_name() {`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`void set_x_dim_name(String x_dim_name) {`
`187`		`- this.x_dim_name = NetCDFUtils.escapeVariableName(x_dim_name);`
	`187`	`+ this.x_dim_name = x_dim_name;`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`String get_y_dim_name() {`
`191`	`191`	`return y_dim_name;`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`void set_y_dim_name(String y_dim_name) {`
`195`		`- this.y_dim_name = NetCDFUtils.escapeVariableName(y_dim_name);`
	`195`	`+ this.y_dim_name = y_dim_name;`
`196`	`196`	`}`
`197`	`197`
`198`	`198`	`String get_z_dim_name() {`
`199`	`199`	`return z_dim_name;`
`200`	`200`	`}`
`201`	`201`
`202`	`202`	`void set_z_dim_name(String z_dim_name) {`
`203`		`- this.z_dim_name = NetCDFUtils.escapeVariableName(z_dim_name);`
	`203`	`+ this.z_dim_name = z_dim_name;`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`String get_nwp_time_variable_name() {`
`207`	`207`	`return nwp_time_variable_name;`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`void set_nwp_time_variable_name(String nwp_time_variable_name) {`
`211`		`- this.nwp_time_variable_name = NetCDFUtils.escapeVariableName(nwp_time_variable_name);`
	`211`	`+ this.nwp_time_variable_name =nwp_time_variable_name;`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`String get_time_variable_name() {`
`215`	`215`	`return time_variable_name;`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`void set_time_variable_name(String time_variable_name) {`
`219`		`- this.time_variable_name = NetCDFUtils.escapeVariableName(time_variable_name);`
	`219`	`+ this.time_variable_name = time_variable_name;`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`String get_longitude_variable_name() {`
`223`	`223`	`return longitude_variable_name;`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`void set_longitude_variable_name(String longitude_variable_name) {`
`227`		`- this.longitude_variable_name = NetCDFUtils.escapeVariableName(longitude_variable_name);`
	`227`	`+ this.longitude_variable_name = longitude_variable_name;`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`String get_latitude_variable_name() {`
`231`	`231`	`return latitude_variable_name;`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`void set_latitude_variable_name(String latitude_variable_name) {`
`235`		`- this.latitude_variable_name = NetCDFUtils.escapeVariableName(latitude_variable_name);`
	`235`	`+ this.latitude_variable_name = latitude_variable_name;`
`236`	`236`	`}`
`237`	`237`
`238`	`238`