more bug fixes

Author: Hailey Johnson

cdm-test/src/test/java/ucar/nc2/ft/point/writer/TestCFPointWriterCompare.java

@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.Formatter;
 import java.util.List;
+
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;

cdm/core/src/main/java/ucar/nc2/ft/point/writer/CFPointWriter.java

@@ -275,7 +275,7 @@ private static int writeStationProfileFeatureCollection(FeatureDatasetPoint data
         for (StationProfileFeature station : (StationProfileFeatureCollection) dsgFeatures) {
           name_strlen = Math.max(name_strlen, station.getName().length());
           for (ProfileFeature fp : station) {
-            countProfiles += Iterables.size((station));
+            countProfiles++;
           }
         }
       }
@@ -287,10 +287,7 @@ private static int writeStationProfileFeatureCollection(FeatureDatasetPoint data
 
       int count = 0;
       for (DsgFeatureCollection featureCollection : dataset.getPointFeatureCollectionList()) {
-        cfWriter.resetObsIndex();
         for (StationProfileFeature station : (StationProfileFeatureCollection) featureCollection) {
-          cfWriter.resetProfileIndex();
-          station.resetIteration();
           for (ProfileFeature pf : station) {
             if (pf.getTime() == null)
               continue; // assume this means its an "incomplete multidimensional"

cdm/core/src/main/java/ucar/nc2/ft/point/writer/WriterCFStationProfileCollection.java

@@ -244,10 +244,6 @@ protected void makeMiddleVariables(List<StructureData> profileDataStructs, boole
 
   private int profileRecno;
 
-  protected void resetProfileIndex() {
-    profileRecno = 0;
-  }
-
   public void writeProfileData(int stnIndex, ProfileFeature profile, int nobs) throws IOException {
     trackBB(profile.getLatLon(), profile.getTime());
 
@@ -271,10 +267,6 @@ public void writeProfileData(int stnIndex, ProfileFeature profile, int nobs) thr
 
   private int obsRecno;
 
-  protected void resetObsIndex() {
-    obsRecno = 0;
-  }
-
   public void writeObsData(PointFeature pf) throws IOException {
     StructureMembers.Builder smb = StructureMembers.builder().setName("Coords");
     smb.addMemberScalar(pf.getFeatureCollection().getTimeName(), null, null, DataType.DOUBLE, pf.getObservationTime());