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

[<jde...@us...>]

Revision: 62
          http://netcdftools.svn.sourceforge.net/netcdftools/?rev=62&view=rev
Author:   jdempsey
Date:     2010-06-25 11:58:44 +0000 (Fri, 25 Jun 2010)

Log Message:
-----------
ANDSWRON-715 - Add indicator for Variable in file 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-25 11:30:12 UTC (rev 61)
+++ trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioAConverter.java	2010-06-25 11:58:44 UTC (rev 62)
@@ -1244,7 +1244,16 @@
         {
             filename += CASE + ".";
         }
-        filename += "Latitude-" + latitudeDegree + "S.S-" + variable + NETCDF_FILE_EXTENSION;
+        filename += "Latitude-";
+        if (latitudeDegree.startsWith("-"))
+        {
+            filename += latitudeDegree.substring(1) + "S."; 
+        }
+        else
+        {
+            filename += latitudeDegree + "N";
+        }
+        filename += "Var-" + variable + NETCDF_FILE_EXTENSION;
         return filename;
     }
 
@@ -1259,7 +1268,7 @@
         {
             filename += CASE + ".";
         }
-        filename += "Decade-" + decadeStr +  "S.S-" + variable + NETCDF_FILE_EXTENSION;
+        filename += "Decade-" + decadeStr +  ".Var-" + variable + NETCDF_FILE_EXTENSION;
         return filename;
     }
 

Modified: trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java
===================================================================
--- trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java	2010-06-25 11:30:12 UTC (rev 61)
+++ trunk/src/main/java/au/csiro/netcdf/wron/MdbsyScenarioCConverter.java	2010-06-25 11:58:44 UTC (rev 62)
@@ -1235,7 +1235,16 @@
         {
             filename += CASE + ".";
         }
-        filename += "Latitude-" + latitudeDegree + "S.S-" + variable + NETCDF_FILE_EXTENSION;
+        filename += "Latitude-";
+        if (latitudeDegree.startsWith("-"))
+        {
+            filename += latitudeDegree.substring(1) + "S."; 
+        }
+        else
+        {
+            filename += latitudeDegree + "N";
+        }
+        filename += "Var-" + variable + NETCDF_FILE_EXTENSION;
         return filename;
     }
 
@@ -1250,7 +1259,7 @@
         {
             filename += CASE + ".";
         }
-        filename += "Decade-" + decadeStr +  "S.S-" + variable + NETCDF_FILE_EXTENSION;
+        filename += "Decade-" + decadeStr +  ".Var-" + variable + NETCDF_FILE_EXTENSION;
         return filename;
     }
 


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