[Netcdftools-commit] SF.net SVN: netcdftools:[13] trunk/src/main/java/au/csiro/netcdf/wron

[<rit...@us...>]

Revision: 13
          http://netcdftools.svn.sourceforge.net/netcdftools/?rev=13&view=rev
Author:   ritacsiro
Date:     2010-06-21 04:56:47 +0000 (Mon, 21 Jun 2010)

Log Message:
-----------
ANDSWRON-663 - Rename of lat and lon variables plus add a long_name.

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioAConverter.java
    trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java

Modified: trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioAConverter.java
===================================================================
--- trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioAConverter.java	2010-06-18 05:23:03 UTC (rev 12)
+++ trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioAConverter.java	2010-06-21 04:56:47 UTC (rev 13)
@@ -147,22 +147,24 @@
     private static final String TIME_BOUNDS = "time_bnds";
 
     // longitude constants
-    private static final String LONG = "long";
+    private static final String LONG = "longitude";
     private static final int LONG_COLUMN_INDEX = 1;
     private static final String LONG_RANGE = "0-296";
     private static final int LONG_SIZE = 297;
     private static final String LONG_UNITS = "degrees_east";
     private static final String LONG_STANDARD_NAME = "longitude";
     private static final String LONG_AXIS = "X";
+    private static final String LONG_LONG_NAME = "longitude";
 
     // latitude constants
-    private static final String LAT = "lat";
+    private static final String LAT = "latitude";
     private static final int LAT_COLUMN_INDEX = 2;
     private static final String LAT_RANGE = "0-278";
     private static final int LAT_SIZE = 279;
     private static final String LAT_UNITS = "degrees_north";
     private static final String LAT_STANDARD_NAME = "latitude";
     private static final String LAT_AXIS = "Y";
+    private static final String LAT_LONG_NAME = "latitude";
 
     // elevation constants
     private static String ELEVATION = "elev";
@@ -570,10 +572,10 @@
         NcDefineVariable command = new NcDefineVariable();
 
         command.execute(new File(outputFileName), LAT, DataType.FLOAT, Arrays.asList(new Attribute("units", LAT_UNITS),
-                new Attribute("standard_name", LAT_STANDARD_NAME), new Attribute("axis", LAT_AXIS)), LAT,
+                new Attribute("long_name", LAT_LONG_NAME), new Attribute("standard_name", LAT_STANDARD_NAME), new Attribute("axis", LAT_AXIS)), LAT,
                 false /* isLargeFileSupport */, false/* fillValue */);
         command.execute(new File(outputFileName), LONG, DataType.FLOAT, Arrays.asList(
-                new Attribute("units", LONG_UNITS), new Attribute("standard_name", LONG_STANDARD_NAME), new Attribute(
+                new Attribute("long_name", LONG_LONG_NAME), new Attribute("units", LONG_UNITS), new Attribute("standard_name", LONG_STANDARD_NAME), new Attribute(
                         "axis", LONG_AXIS)), LONG, false /* isLargeFileSupport */, false/* fillValue */);
         command.execute(new File(outputFileName), TIME, DataType.INT, Arrays.asList(new Attribute("units", TIME_UNITS),
                 new Attribute("long_name", TIME_LONG_NAME), new Attribute("standard_name", TIME_STANDARD_NAME),

Modified: trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java
===================================================================
--- trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java	2010-06-18 05:23:03 UTC (rev 12)
+++ trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java	2010-06-21 04:56:47 UTC (rev 13)
@@ -137,23 +137,25 @@
     private static final String TIME_BOUNDS = "time_bnds";
 
     // longitude constants
-    private static final String LONG = "long";
+    private static final String LONG = "longitude";
     private static final int LONG_COLUMN_INDEX = 1;
     private static final String LONG_RANGE = "0-296";
     private static final int LONG_SIZE = 297;
     private static final String LONG_UNITS = "degrees_east";
     private static final String LONG_STANDARD_NAME = "longitude";
     private static final String LONG_AXIS = "X";
+    private static final String LONG_LONG_NAME = "longitude";
 
     // latitude constants
-    private static final String LAT = "lat";
+    private static final String LAT = "latitude";
     private static final int LAT_COLUMN_INDEX = 2;
     private static final String LAT_RANGE = "0-278";
     private static final int LAT_SIZE = 279;
     private static final String LAT_UNITS = "degrees_north";
     private static final String LAT_STANDARD_NAME = "latitude";
     private static final String LAT_AXIS = "Y";
-
+    private static final String LAT_LONG_NAME = "latitude";
+    
     // elevation constants
     private static String ELEVATION = "elev";
     private static int ELEVATION_COLUMN_INDEX = 3;
@@ -570,10 +572,10 @@
         NcDefineVariable command = new NcDefineVariable();
 
         command.execute(new File(outputFileName), LAT, DataType.FLOAT, Arrays.asList(new Attribute("units", LAT_UNITS),
-                new Attribute("standard_name", LAT_STANDARD_NAME), new Attribute("axis", LAT_AXIS)), LAT,
+                new Attribute("long_name", LAT_LONG_NAME), new Attribute("standard_name", LAT_STANDARD_NAME), new Attribute("axis", LAT_AXIS)), LAT,
                 false /* isLargeFileSupport */, false/* fillValue */);
         command.execute(new File(outputFileName), LONG, DataType.FLOAT, Arrays.asList(
-                new Attribute("units", LONG_UNITS), new Attribute("standard_name", LONG_STANDARD_NAME), new Attribute(
+                new Attribute("long_name", LONG_LONG_NAME), new Attribute("units", LONG_UNITS), new Attribute("standard_name", LONG_STANDARD_NAME), new Attribute(
                         "axis", LONG_AXIS)), LONG, false /* isLargeFileSupport */, false/* fillValue */);
         command.execute(new File(outputFileName), TIME, DataType.INT, Arrays.asList(new Attribute("units", TIME_UNITS),
                 new Attribute("long_name", TIME_LONG_NAME), new Attribute("standard_name", TIME_STANDARD_NAME),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.