read time series data

Author: TomBlock

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/Era5Archive.java

@@ -38,19 +38,13 @@ static String mapVariable(String variable) {
     }
 
     static String getTimeString(String collection, Calendar utcCalendar) {
-        final Calendar clonedCalendar = (Calendar) utcCalendar.clone();
-
-        int hour = clonedCalendar.get(Calendar.HOUR_OF_DAY);
-        if (hour < 6 && collection.startsWith("fc_")) {
-            clonedCalendar.add(Calendar.DATE, -1);
-        }
-
-        final int year = clonedCalendar.get(Calendar.YEAR);
+        int hour = utcCalendar.get(Calendar.HOUR_OF_DAY);
+        final int year = utcCalendar.get(Calendar.YEAR);
 
-        final int month = clonedCalendar.get(Calendar.MONTH) + 1;
+        final int month = utcCalendar.get(Calendar.MONTH) + 1;
         final String monthString = twoDigitsFormat.format(month);
 
-        final int day = clonedCalendar.get(Calendar.DAY_OF_MONTH);
+        final int day = utcCalendar.get(Calendar.DAY_OF_MONTH);
         final String dayString = twoDigitsFormat.format(day);
 
         if (collection.startsWith("an_")) {
@@ -86,6 +80,8 @@ String get(String variableType, int timeStamp) {
         String variable = variableType.substring(cutPoint + 1, variableType.length());
         variable = mapVariable(variable);
 
+        adjustCalendarForForecast(utcCalendar, collection);
+
         final String timeString = getTimeString(collection, utcCalendar);
         final String fileName = getFileName(collection, variable, timeString);
 
@@ -101,4 +97,12 @@ String get(String variableType, int timeStamp) {
                 year + File.separator + monthString + File.separator + dayString + File.separator +
                 fileName;
     }
+
+    // @todo 1 tb/tb make static and add test 2020-12-11
+    private void adjustCalendarForForecast(Calendar utcCalendar, String collection) {
+        int hour = utcCalendar.get(Calendar.HOUR_OF_DAY);
+        if (hour <= 6 && collection.startsWith("fc_")) {
+            utcCalendar.add(Calendar.DATE, -1);
+        }
+    }
 }

post-processing-tool/src/main/java/com/bc/fiduceo/post/plugin/era5/MatchupFields.java

@@ -86,14 +86,10 @@ void compute(Configuration config, NetcdfFile reader, NetcdfFileWriter writer) t
                         timeIndex.set(m, t);
                         final int timeStamp = targetTimeArray.getInt(timeIndex);
                         // @todo 1 tb/tb continue here 2020-12-10
-//                        final Variable variable = variableCache.get(variableKey, timeStamp);
+                        final Variable variable = variableCache.get(variableKey, timeStamp);
                     }
                 }
-
             }
-
-
-
         } finally {
             variableCache.close();
         }
@@ -107,7 +103,7 @@ private static Array createTimeArray(NetcdfFile reader, MatchupFieldsConfigurati
         final Array targetTimeArray = Array.factory(DataType.INT, nwpTimeVariable.getShape());
         final Index targetIndex = targetTimeArray.getIndex();
 
-        final int offset = -matchupConfig.get_time_steps_past();
+        final int offset = - matchupConfig.get_time_steps_past();
         final Index index = era5TimeArray.getIndex();
         for (int i = 0; i < numMatchups; i++) {
             index.set(i);

post-processing-tool/src/test/java/com/bc/fiduceo/post/plugin/era5/Era5ArchiveTest.java

@@ -73,7 +73,7 @@ public void testGetTimeString_fc(){
         utcCalendar.set(Calendar.HOUR_OF_DAY, 3);
 
         String metssTime = Era5Archive.getTimeString("fc_sfc_metss", utcCalendar);
-        assertEquals("2008060318009", metssTime);
+        assertEquals("2008060418009", metssTime);
 
         utcCalendar.setTimeInMillis(1212600800000L);
         utcCalendar.set(Calendar.HOUR_OF_DAY, 11);