New options: CF_NOTE, CF_NOTE_ALWAYS, CF_NOTE_LEVEL_LIMIT

IS-ENES-Data · Sep 29, 2015 · 0e676a0 · 0e676a0
1 parent 0cf38a6
commit 0e676a0
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 166 deletions.
diff --git a/scripts/qa-dkrz b/scripts/qa-dkrz
@@ -375,9 +375,12 @@ callQaExecutor()
           ARITHMETIC_MEAN \
           CASE_INSENSITIVE_VARIABLE_NAME \
           CF \
+          CF_AREA_TYPES \
           CF_CHECK_LIST \
           CF_FOLLOW_RECOMMENDATIONS \
-          CF_AREA_TYPES \
+          CF_NOTE \
+          CF_NOTE_ALWAYS \
+          CF_NOTE_LEVEL_LIMIT \
           CF_STANDARD_NAMES \
           CF_STD_REGION_NAMES \
           CHECK_MODE \

diff --git a/scripts/qa-exec-check b/scripts/qa-exec-check
@@ -1472,6 +1472,24 @@ set_X_par()
   else
     par=${par}"$1"
 
+    if [ "${CF_NOTE}" ] ; then
+      local saveNOTE
+      test ${NOTE} && saveNOTE=( ${NOTE[*]} )
+      NOTE=( ${CF_NOTE} )
+    fi
+
+    if [ "${CF_NOTE_ALWAYS}" ] ; then
+      local saveNOTE_ALWAYS
+      test ${NOTE_ALWAYS} && saveNOTE_ALWAYS=( ${NOTE_ALWAYS[*]} )
+      NOTE_ALWAYS=( ${CF_NOTE_ALWAYS[*]} )
+    fi
+
+    if [ "${CF_NOTE_LEVEL_LIMIT}" ] ; then
+      local saveNOTE_LEVEL_LIMIT
+      test ${NOTE_LEVEL_LIMIT} && saveNOTE_LEVEL_LIMIT=( ${NOTE_LEVEL_LIMIT[*]} )
+      NOTE_LEVEL_LIMIT=( ${CF_NOTE_LEVEL_LIMIT[*]} )
+    fi
+
     test ${#CF_CHECK_LIST} -gt 0 && \
       par=${par}":"cL=${CF_CHECK_LIST}
 
@@ -1513,6 +1531,10 @@ set_X_par()
 
   par=${par}":Y"
 
+  test ${saveNOTE} && NOTE=( ${saveNOTE[*]} )
+  test ${saveNOTE_ALWAYS} && NOTE_ALWAYS=( ${saveNOTE_ALWAYS[*]} )
+  test ${saveNOTE_LEVEL_LIMIT} && NOTE_LEVEL_LIMIT=( ${saveNOTE_LEVEL_LIMIT[*]} )
+
   return
 }