Merge pull request #49 from NOAA-OWP/issue48

Issue48
NOAA-OWP · Jul 19, 2024 · 4b80685 · 4b80685
2 parents b1820f2 + 368a096
commit 4b80685
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/wres-config/src/wres/config/yaml/DeclarationValidator.java b/wres-config/src/wres/config/yaml/DeclarationValidator.java
@@ -4023,11 +4023,13 @@ private static List<EvaluationStatusEvent> evaluationTimeScaleIsValid( TimeScale
             {
                 EvaluationStatusEvent event
                         = EvaluationStatusEvent.newBuilder()
-                                               .setStatusLevel( StatusLevel.ERROR )
-                                               .setEventMessage( "The evaluation 'time_scale' is prescriptive and "
-                                                                 + "cannot be instantaneous. Please remove the "
-                                                                 + "evaluation 'time_scale' or increase it and try "
-                                                                 + AGAIN )
+                                               .setStatusLevel( StatusLevel.WARN )
+                                               .setEventMessage( "The evaluation 'time_scale' is instantaneous. If the "
+                                                                 + "datasets all contain instantaneous values, this "
+                                                                 + "declaration is redundant and should be removed. "
+                                                                 + "Otherwise, the declaration is invalid because "
+                                                                 + "the smallest possible 'time_scale' is "
+                                                                 + "instantaneous and downscaling is not supported." )
                                                .build();
                 events.add( event );
             }

diff --git a/wres-config/test/wres/config/yaml/DeclarationValidatorTest.java b/wres-config/test/wres/config/yaml/DeclarationValidatorTest.java
@@ -701,7 +701,7 @@ void testEvaluateDatasetTimeScaleIsValidResultsinError()
     }
 
     @Test
-    void testEvaluationTimeScaleIsConsistentWithDatasetTimeScalesResultsInErrors()
+    void testEvaluationTimeScaleIsConsistentWithDatasetTimeScalesResultsInWarningsAndErrors()
     {
         TimeScale timeScaleInnerSource = TimeScale.newBuilder()
                                                   .setPeriod( Duration.newBuilder()
@@ -754,8 +754,9 @@ void testEvaluationTimeScaleIsConsistentWithDatasetTimeScalesResultsInErrors()
 
         List<EvaluationStatusEvent> events = DeclarationValidator.validate( declaration );
 
-        assertAll( () -> assertTrue( DeclarationValidatorTest.contains( events, "cannot be instantaneous",
-                                                                        StatusLevel.ERROR ) ),
+        assertAll( () -> assertTrue( DeclarationValidatorTest.contains( events, "The evaluation 'time_scale' "
+                                                                                + "is instantaneous",
+                                                                        StatusLevel.WARN ) ),
                    () -> assertTrue( DeclarationValidatorTest.contains( events, "is smaller than the "
                                                                                 + "evaluation 'time_scale'",
                                                                         StatusLevel.ERROR ) ),