Skip to content

Commit

Permalink
Merge pull request #352 from NOAA-OWP/issue245
Browse files Browse the repository at this point in the history 
Add the earliest lead duration to the name of each netcdf blob, #245.
  • Loading branch information
@james-d-brown
james-d-brown authored Oct 29, 2024
2 parents a0d974d + d7be3df commit 27d50cc
Show file tree
Hide file tree
Showing 7 changed files with 118 additions and 107 deletions.
2 changes: 1 addition & 1 deletion systests/dist/src/test/java/wres/systests/Scenario512.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public class Scenario512
*/

private static final Set<Path> EXPECTED_FILE_NAMES =
Set.of( Path.of( "10800_SECONDS.nc" ),
Set.of( Path.of( "0-10800_SECONDS.nc" ),
Path.of( "evaluation.csv.gz" ),
Path.of( "evaluation.csvt" ),
Path.of( "pairs.csv.gz" ),
Expand Down
36 changes: 18 additions & 18 deletions systests/dist/src/test/java/wres/systests/Scenario650.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,24 +99,24 @@ public class Scenario650
Path.of( "76.822586W_39.230167N_NWM_Short_Range_PEARSON_CORRELATION_COEFFICIENT.csv" ),
Path.of( "76.822586W_39.230167N_NWM_Short_Range_SAMPLE_SIZE.csv" ),
Path.of( "pairs.csv.gz" ),
Path.of( "NWM_Short_Range_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_18000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_21600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_25200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_28800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_32400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_36000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_39600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_43200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_46800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_50400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_54000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_57600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_61200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_7200_SECONDS.nc" ) );
Path.of( "NWM_Short_Range_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_18000-18000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_21600-21600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_25200-25200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_28800-28800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_32400-32400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_36000-36000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_39600-39600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_43200-43200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_46800-46800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_50400-50400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_54000-54000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_57600-57600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_61200-61200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_64800-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_7200-7200_SECONDS.nc" ) );


private ScenarioInformation scenarioInfo;
Expand Down
18 changes: 9 additions & 9 deletions systests/dist/src/test/java/wres/systests/Scenario651.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,15 +73,15 @@ public class Scenario651
Path.of( "124.768875W_50.54845N_NWM_Short_Range_PEARSON_CORRELATION_COEFFICIENT.csv" ),
Path.of( "124.768875W_50.54845N_NWM_Short_Range_SAMPLE_SIZE.csv" ),
Path.of( "pairs.csv.gz" ),
Path.of( "NWM_Short_Range_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_50400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_21600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_57600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_28800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_36000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_43200_SECONDS.nc" ) );
Path.of( "NWM_Short_Range_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_50400-50400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_21600-21600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_57600-57600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_28800-28800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_64800-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_36000-36000_SECONDS.nc" ),
Path.of( "NWM_Short_Range_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_43200-43200_SECONDS.nc" ) );

private ScenarioInformation scenarioInfo;

Expand Down
96 changes: 48 additions & 48 deletions systests/dist/src/test/java/wres/systests/Scenario652.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,54 +73,54 @@ public class Scenario652
Path.of( "124.768875W_50.54845N_NWM_Short_Range_PEARSON_CORRELATION_COEFFICIENT.csv" ),
Path.of( "124.768875W_50.54845N_NWM_Short_Range_SAMPLE_SIZE.csv" ),
Path.of( "pairs.csv.gz" ),
Path.of( "NWM_Short_Range_20180526T040000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T040000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T040000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T040000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_7200_SECONDS.nc" ) );
Path.of( "NWM_Short_Range_20180526T040000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T040000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T040000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T040000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T080000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T120000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T160000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180526T200000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T000000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T040000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T080000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T120000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T160000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180527T200000Z_7200-7200_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_10800-10800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_14400-14400_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_3600-3600_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20180528T000000Z_7200-7200_SECONDS.nc" ) );


private ScenarioInformation scenarioInfo;
Expand Down
2 changes: 1 addition & 1 deletion systests/dist/src/test/java/wres/systests/Scenario653.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public class Scenario653
Path.of( "76.822586W_39.230167N_NWM_Short_Range_PEARSON_CORRELATION_COEFFICIENT.csv" ),
Path.of( "76.822586W_39.230167N_NWM_Short_Range_SAMPLE_SIZE.csv" ),
Path.of( "pairs.csv.gz" ),
Path.of( "NWM_Short_Range_14400_SECONDS.nc" ) );
Path.of( "NWM_Short_Range_0-14400_SECONDS.nc" ) );

private ScenarioInformation scenarioInfo;

Expand Down
48 changes: 24 additions & 24 deletions systests/dist/src/test/java/wres/systests/Scenario703.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,30 @@ public class Scenario703
*/

private static final Set<Path> EXPECTED_NC_FILES =
Set.of( Path.of( "NWM_Short_Range_20170808T000000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T010000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T020000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T030000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T040000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T050000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T060000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T070000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T080000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T090000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T100000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T110000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T120000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T130000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T140000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T150000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T160000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T170000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T180000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T190000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T200000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T210000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T220000Z_64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T230000Z_64800_SECONDS.nc" ) );
Set.of( Path.of( "NWM_Short_Range_20170808T000000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T010000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T020000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T030000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T040000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T050000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T060000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T070000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T080000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T090000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T100000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T110000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T120000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T130000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T140000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T150000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T160000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T170000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T180000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T190000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T200000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T210000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T220000Z_0-64800_SECONDS.nc" ),
Path.of( "NWM_Short_Range_20170808T230000Z_0-64800_SECONDS.nc" ) );


private ScenarioInformation scenarioInfo;
Expand Down
Loading

0 comments on commit 27d50cc

Please sign in to comment.