added air temperature and rel humidity

Author: TomBlock

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/AIRTRecord.java

@@ -0,0 +1,9 @@
+package com.bc.fiduceo.reader.insitu.tao.preproc;
+
+class AIRTRecord {
+
+    int date;
+    String AIRT;
+    String Q;
+    String M;
+}

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/AirtProvider.java

@@ -0,0 +1,53 @@
+package com.bc.fiduceo.reader.insitu.tao.preproc;
+
+import org.esa.snap.core.util.StringUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+
+class AirtProvider {
+
+    private HashMap<Integer, AIRTRecord> airtMap;
+
+    void open(File airtFile) {
+        airtMap = new HashMap<>();
+
+        try (final FileReader fileReader = new FileReader(airtFile)) {
+            final BufferedReader bufferedReader = new BufferedReader(fileReader);
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (!Character.isDigit(line.charAt(0))) {
+                    continue;
+                }
+
+                final AIRTRecord airtRecord = new AIRTRecord();
+                final String[] tokens = StringUtils.split(line, new char[]{' '}, true);
+                airtRecord.date = TaoPreProcessor.toUnixEpoch(tokens[0], tokens[1]);
+                airtRecord.AIRT = tokens[2];
+                airtRecord.Q = tokens[3];
+                airtRecord.M = tokens[4];
+
+                airtMap.put(airtRecord.date, airtRecord);
+            }
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    AIRTRecord get(int date) {
+        AIRTRecord airtRecord = airtMap.get(date);
+        if (airtRecord == null) {
+            airtRecord = new AIRTRecord();
+            airtRecord.date = date;
+            airtRecord.AIRT = "-9.99";
+            airtRecord.Q = "9";
+            airtRecord.M = "D";
+        }
+
+        return airtRecord;
+    }
+}

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/Configuration.java

@@ -6,4 +6,6 @@ class Configuration {
     String filePrefix;
     String sssFileName;
     String sstFileName;
+    String airtFileName;
+    String rhFileName;
 }

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/RHProvider.java

@@ -0,0 +1,52 @@
+package com.bc.fiduceo.reader.insitu.tao.preproc;
+
+import org.esa.snap.core.util.StringUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.HashMap;
+
+class RHProvider {
+
+    private HashMap<Integer, RHRecord> rhMap;
+
+    void open(File rhFile) {
+        rhMap = new HashMap<>();
+
+        try (final FileReader fileReader = new FileReader(rhFile)) {
+            final BufferedReader bufferedReader = new BufferedReader(fileReader);
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (!Character.isDigit(line.charAt(0))) {
+                    continue;
+                }
+
+                final RHRecord rhRecord = new RHRecord();
+                final String[] tokens = StringUtils.split(line, new char[]{' '}, true);
+                rhRecord.date = TaoPreProcessor.toUnixEpoch(tokens[0], tokens[1]);
+                rhRecord.RH = tokens[2];
+                rhRecord.Q = tokens[3];
+                rhRecord.M = tokens[4];
+
+                rhMap.put(rhRecord.date, rhRecord);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    RHRecord get(int date) {
+        RHRecord rhRecord = rhMap.get(date);
+        if (rhRecord == null) {
+            rhRecord = new RHRecord();
+            rhRecord.date = date;
+            rhRecord.RH = "-9.99";
+            rhRecord.Q = "9";
+            rhRecord.M = "D";
+        }
+
+        return rhRecord;
+    }
+}

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/RHRecord.java

@@ -0,0 +1,9 @@
+package com.bc.fiduceo.reader.insitu.tao.preproc;
+
+class RHRecord {
+
+    int date;
+    String RH;
+    String Q;
+    String M;
+}

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/SSTProvider.java

@@ -41,6 +41,7 @@ SSTRecord get(int date) {
         SSTRecord sstRecord = sstMap.get(date);
         if (sstRecord == null) {
             sstRecord = new SSTRecord();
+            sstRecord.date = date;
             sstRecord.SST = "-9.999";
             sstRecord.Q = "9";
             sstRecord.M = "D";

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/TAORecord.java

@@ -4,10 +4,12 @@ class TAORecord {
     int date;
     String SSS;
     String SST;
+    String AIRT;
+    String RH;
     String Q;
     String M;
 
     String toLine() {
-        return date + " " + SSS + " " + SST + " " +Q + " " + M;
+        return date + " " + SSS + " " + SST + " " + AIRT + " " + RH + " " + Q + " " + M;
     }
 }

core/src/main/java/com/bc/fiduceo/reader/insitu/tao/preproc/TaoPreProcessor.java

@@ -16,6 +16,8 @@ public static void main(String[] args) throws IOException {
         configuration.filePrefix = "TAO_T0N110W";
         configuration.sssFileName = "TAO_T0N110W_D_SALT_hourly.ascii";
         configuration.sstFileName = "TAO_T0N110W_D_SST_10min.ascii";
+        configuration.airtFileName = "TAO_T0N110W_D_AIRT_10min.ascii";
+        configuration.rhFileName = "TAO_T0N110W_D_RH_10min.ascii";
 
         // --- read all we need ---
         final File sourceDir = new File(configuration.sourceDir);
@@ -25,6 +27,12 @@ public static void main(String[] args) throws IOException {
         final SSTProvider sstProvider = new SSTProvider();
         sstProvider.open(new File(sourceDir, configuration.sstFileName));
 
+        final AirtProvider airtProvider = new AirtProvider();
+        airtProvider.open(new File(sourceDir, configuration.airtFileName));
+
+        final RHProvider rhProvider = new RHProvider();
+        rhProvider.open(new File(sourceDir, configuration.rhFileName));
+
         final HashMap<String, List<TAORecord>> taoMap = new HashMap<>();
 
         // --- assemble final records ---
@@ -38,6 +46,7 @@ public static void main(String[] args) throws IOException {
                 String M = "";
                 String Q = "";
 
+                // salinity
                 taoRecord.date = sssRecord.date;
                 taoRecord.SSS = sssRecord.SSS;
                 M = M.concat(sssRecord.M);
@@ -49,6 +58,18 @@ public static void main(String[] args) throws IOException {
                 M = M.concat(sstRecord.M);
                 Q = Q.concat(sstRecord.Q);
 
+                // airt data
+                final AIRTRecord airtRecord = airtProvider.get(sssRecord.date);
+                taoRecord.AIRT = airtRecord.AIRT;
+                M = M.concat(airtRecord.M);
+                Q = Q.concat(airtRecord.Q);
+
+                // relative humidity
+                final RHRecord rhRecord = rhProvider.get(sssRecord.date);
+                taoRecord.RH = rhRecord.RH;
+                M = M.concat(rhRecord.M);
+                Q = Q.concat(rhRecord.Q);
+
                 taoRecord.M = M;
                 taoRecord.Q = Q;
 

core/src/test/java/com/bc/fiduceo/reader/insitu/tao/preproc/TAORecordTest.java

@@ -12,10 +12,12 @@ public void testToString()  {
         taoRecord.date = 1543910594;
         taoRecord.SSS = "23.5";
         taoRecord.SST = "24.6";
-        taoRecord.Q = "23";
-        taoRecord.M = "DM";
+        taoRecord.AIRT = "25.7";
+        taoRecord.RH = "26.8";
+        taoRecord.Q = "2342";
+        taoRecord.M = "DMDM";
 
-        assertEquals("1543910594 23.5 24.6 23 DM", taoRecord.toLine());
+        assertEquals("1543910594 23.5 24.6 25.7 26.8 2342 DMDM", taoRecord.toLine());
 
     }
 }