fixes #1657

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Fixed bug that required a /dev/null ExtData entry to still have a file variable name
+
 ### Added
 
 ### Changed

Tests/ExtData_Testing_Framework/test_cases/case19/extdata.yaml

@@ -1,2 +1,2 @@
 Exports:
-   VAR2D: {variable: VAR2D, collection: "/dev/null", linear_transformation: [17.0,0.0]}
+   VAR2D: {collection: "/dev/null", linear_transformation: [17.0,0.0]}

gridcomps/ExtData2G/ExtDataRule.F90

@@ -41,7 +41,7 @@ function new_ExtDataRule(config,sample_map,key,unusable,multi_rule,rc) result(ru
       integer, optional, intent(out) :: rc
 
       type(ExtDataRule) :: rule
-      logical :: is_present
+      logical :: collection_present, variable_present
       integer :: status
       class(YAML_Node), pointer ::config1
       character(len=:), allocatable :: tempc
@@ -56,20 +56,20 @@ function new_ExtDataRule(config,sample_map,key,unusable,multi_rule,rc) result(ru
       end if
 
       if (allocated(tempc)) deallocate(tempc)
-      is_present = config%has("collection")
-      _ASSERT(is_present,"no collection present in ExtData export")
+      collection_present = config%has("collection")
+      _ASSERT(collection_present,"no collection present in ExtData export")
       rule%collection = config%of("collection")
 
       if (allocated(tempc)) deallocate(tempc)
-      is_present = config%has("variable")
+      variable_present = config%has("variable")
       if (index(rule%collection,"/dev/null")==0) then
-         _ASSERT(is_present,"no variable present in ExtData export")
+         _ASSERT(variable_present,"no variable present in ExtData export")
       end if
-      if (is_present) then
+      if (variable_present) then
          tempc = config%of("variable")
          rule%file_var=tempc
       else
-         _FAIL("no variable name in rule")
+         rule%file_var='null'
       end if
 
       if (config%has("sample")) then