H5iosp/Tiling bug

yuan's rewrite class

cdm/src/main/java/ucar/nc2/iosp/hdf5/Tiling.java

@@ -64,14 +64,17 @@ public Tiling(int[] shape, int[] tileSize) {
     this.shape = new int[rank];
     for (int i=0; i<rank; i++)
       this.shape[i] = Math.max(shape[i], tileSize[i]);
-    int[] tile = tile(this.shape);
 
-    // LOOK this is wrong
+    int[] tiles = new int[rank];
+    for (int i = 0; i < rank; i++) {
+      tiles[i] = (this.shape[i] +tileSize[i] - 1) / tileSize[i];
+    }
+
     this.stride = new int[rank];
     int strider = 1;
     for (int k = rank-1; k >= 0; k--) {
       stride[k] = strider;
-      strider *= tile[k];
+      strider *= tiles[k];
     }
   }
 

cdm/src/main/java/ucar/nc2/rewrite/Rewrite.java

@@ -52,14 +52,18 @@ public class Rewrite {
   NetcdfFile ncIn;
   NetcdfFileWriter ncOut;
   NetcdfFileWriter.Version version;
+  boolean isRadial = false;
 
-  Rewrite(NetcdfFile ncIn, NetcdfFileWriter ncOut) {
+  public Rewrite(NetcdfFile ncIn, NetcdfFileWriter ncOut) {
     this.ncIn = ncIn;
     this.ncOut = ncOut;
     this.version = ncOut.getVersion();
   }
 
-  void rewrite() throws IOException, InvalidRangeException {
+  public void rewrite() throws IOException, InvalidRangeException {
+    Attribute attr = ncIn.getRootGroup().findAttribute("featureType");
+    if(attr.getStringValue().contains("RADIAL"))
+        isRadial = true;
     createGroup(null, ncIn.getRootGroup());
 
     ncOut.create();
@@ -94,7 +98,7 @@ void createGroup(Group newParent, Group oldGroup) throws IOException, InvalidRan
       }
 
       Variable nv;
-      if (v.getRank() >= 3) {  // make first dimension last
+      if (!isRadial && v.getRank() >= 3) {  // make first dimension last
         StringBuilder sb = new StringBuilder();
         for (int i=1; i<dims.size(); i++)
           sb.append(dims.get(i).getShortName()).append(" ");
@@ -117,7 +121,7 @@ void createGroup(Group newParent, Group oldGroup) throws IOException, InvalidRan
   void transferData(Group oldGroup) throws IOException, InvalidRangeException {
 
     for (Variable v : oldGroup.getVariables()) {
-      if (v.getRank() >= 3) {
+      if (!isRadial && v.getRank() >= 3) {
         invertOneVar(v);
 
       } else {