Merge branch 'master' of https://github.com/NOAA-OWP/wres

NOAA-OWP · Jul 19, 2024 · e8bd3c2 · e8bd3c2
2 parents 18e6ce1 + 4b80685
commit e8bd3c2
Show file tree

Hide file tree

Showing 86 changed files with 185,514 additions and 185,255 deletions.
diff --git a/src/wres/pipeline/EvaluationUtilities.java b/src/wres/pipeline/EvaluationUtilities.java
@@ -371,9 +371,6 @@ static void closeEvaluationMessager( EvaluationMessager messager,
     static SharedWriters getSharedWriters( EvaluationDeclaration declaration,
                                            Path outputDirectory )
     {
-        // Obtain the duration units for outputs: #55441
-        ChronoUnit durationUnits = declaration.durationFormat();
-
         SharedSampleDataWriters sharedSampleWriters = null;
         SharedSampleDataWriters sharedBaselineSampleWriters = null;
 
@@ -386,14 +383,12 @@ static SharedWriters getSharedWriters( EvaluationDeclaration declaration,
             sharedSampleWriters =
                     SharedSampleDataWriters.of( Paths.get( outputDirectory.toString(),
                                                            PairsWriter.DEFAULT_PAIRS_ZIP_NAME ),
-                                                durationUnits,
                                                 decimalFormatter );
             // Baseline writer?
             if ( DeclarationUtilities.hasBaseline( declaration ) )
             {
                 sharedBaselineSampleWriters = SharedSampleDataWriters.of( Paths.get( outputDirectory.toString(),
                                                                                      PairsWriter.DEFAULT_BASELINE_PAIRS_ZIP_NAME ),
-                                                                          durationUnits,
                                                                           decimalFormatter );
             }
         }

diff --git a/systests/scenario001/benchmarks/sorted_pairs.csv b/systests/scenario001/benchmarks/sorted_pairs.csv
diff --git a/systests/scenario003/benchmarks/sorted_pairs.csv b/systests/scenario003/benchmarks/sorted_pairs.csv
diff --git a/systests/scenario007/benchmarks/sorted_pairs.csv b/systests/scenario007/benchmarks/sorted_pairs.csv
diff --git a/systests/scenario008/benchmarks/sorted_pairs.csv b/systests/scenario008/benchmarks/sorted_pairs.csv
diff --git a/systests/scenario009/benchmarks/sorted_pairs.csv b/systests/scenario009/benchmarks/sorted_pairs.csv
diff --git a/systests/scenario010/benchmarks/sorted_pairs.csv b/systests/scenario010/benchmarks/sorted_pairs.csv
diff --git a/systests/scenario012/benchmarks/sorted_pairs.csv b/systests/scenario012/benchmarks/sorted_pairs.csv
@@ -1,21 +1,21 @@
-FEATURE DESCRIPTION,FEATURE GROUP NAME,EARLIEST ISSUE TIME,LATEST ISSUE TIME,EARLIEST VALID TIME,LATEST VALID TIME,EARLIEST LEAD TIME IN SECONDS [MEAN OVER PAST 14400 SECONDS],LATEST LEAD TIME IN SECONDS [MEAN OVER PAST 14400 SECONDS],VALID TIME OF PAIR,LEAD DURATION OF PAIR IN SECONDS [MEAN OVER PAST 14400 SECONDS],LEFT IN CMS,RIGHT MEMBER 2009 IN CMS
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-02T16:00:00Z,14400,19.859525,19.714875
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-03T16:00:00Z,14400,20.129175,21.385925
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-02T17:00:00Z,18000,19.498275,19.734200
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-03T17:00:00Z,18000,19.706625,21.384700
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-03T16:00:00Z,14400,20.129175,21.385925
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-04T16:00:00Z,14400,20.752774,23.044200
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-03T17:00:00Z,18000,19.706625,21.384700
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-04T17:00:00Z,18000,20.292299,23.118850
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-04T16:00:00Z,14400,20.752774,23.044200
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-05T16:00:00Z,14400,20.711125,21.504775
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-04T17:00:00Z,18000,20.292299,23.118850
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-05T17:00:00Z,18000,20.239075,21.543500
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-05T16:00:00Z,14400,20.711125,21.504775
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-06T16:00:00Z,14400,22.034600,21.985475
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-05T17:00:00Z,18000,20.239075,21.543500
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-06T17:00:00Z,18000,21.579925,22.053650
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-06T16:00:00Z,14400,22.034600,21.985475
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,14400,14400,1985-06-07T16:00:00Z,14400,24.947025,26.212900
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-06T17:00:00Z,18000,21.579925,22.053650
-DRRC2HSF,DRRC2HSF-DRRC2HSF,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,18000,18000,1985-06-07T17:00:00Z,18000,24.499500,26.295500
+FEATURE NAME,FEATURE GROUP NAME,VARIABLE NAME,EARLIEST ISSUE TIME,LATEST ISSUE TIME,EARLIEST VALID TIME,LATEST VALID TIME,EARLIEST LEAD TIME [MEAN OVER PAST PT4H],LATEST LEAD TIME [MEAN OVER PAST PT4H],REFERENCE TIME,VALID TIME,LEAD DURATION [MEAN OVER PAST PT4H],OBSERVED IN CMS,PREDICTED MEMBER 2009 IN CMS
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-02T12:00:00Z,1985-06-02T16:00:00Z,PT4H,19.859525,19.714875
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-02T12:00:00Z,1985-06-02T17:00:00Z,PT5H,19.498275,19.734200
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-03T12:00:00Z,1985-06-03T16:00:00Z,PT4H,20.129175,21.385925
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-01T12:00:00Z,1985-06-03T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-03T12:00:00Z,1985-06-03T17:00:00Z,PT5H,19.706625,21.384700
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-03T12:00:00Z,1985-06-03T16:00:00Z,PT4H,20.129175,21.385925
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-03T12:00:00Z,1985-06-03T17:00:00Z,PT5H,19.706625,21.384700
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-04T12:00:00Z,1985-06-04T16:00:00Z,PT4H,20.752774,23.044200
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-02T12:00:00Z,1985-06-04T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-04T12:00:00Z,1985-06-04T17:00:00Z,PT5H,20.292299,23.118850
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-04T12:00:00Z,1985-06-04T16:00:00Z,PT4H,20.752774,23.044200
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-04T12:00:00Z,1985-06-04T17:00:00Z,PT5H,20.292299,23.118850
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-05T12:00:00Z,1985-06-05T16:00:00Z,PT4H,20.711125,21.504775
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-03T12:00:00Z,1985-06-05T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-05T12:00:00Z,1985-06-05T17:00:00Z,PT5H,20.239075,21.543500
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-05T12:00:00Z,1985-06-05T16:00:00Z,PT4H,20.711125,21.504775
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-05T12:00:00Z,1985-06-05T17:00:00Z,PT5H,20.239075,21.543500
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-06T12:00:00Z,1985-06-06T16:00:00Z,PT4H,22.034600,21.985475
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-04T12:00:00Z,1985-06-06T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-06T12:00:00Z,1985-06-06T17:00:00Z,PT5H,21.579925,22.053650
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-06T12:00:00Z,1985-06-06T16:00:00Z,PT4H,22.034600,21.985475
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-06T12:00:00Z,1985-06-06T17:00:00Z,PT5H,21.579925,22.053650
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT4H,PT4H,1985-06-07T12:00:00Z,1985-06-07T16:00:00Z,PT4H,24.947025,26.212900
+DRRC2HSF,DRRC2HSF-DRRC2HSF,QINE,1985-06-05T12:00:00Z,1985-06-07T12:00:00Z,-1000000000-01-01T00:00:00Z,+1000000000-12-31T23:59:59.999999999Z,PT5H,PT5H,1985-06-07T12:00:00Z,1985-06-07T17:00:00Z,PT5H,24.499500,26.295500