Merge pull request #19 from PALEOtoolkit/field_data_default_fix

v0.18.1: Bugfix for :field_data default for host dependencies
PALEOtoolkit · May 13, 2022 · 752ae89 · 752ae89 · sjdaines · May 13, 2022
2 parents fe27b85 + 185a4c8
commit 752ae89
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "PALEOboxes"
 uuid = "804b410e-d900-4b2a-9ecd-f5a06d4c1fd4"
 authors = ["Stuart Daines <[email protected]>"]
-version = "0.18.0"
+version = "0.18.1"
 
 [deps]
 BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"

diff --git a/src/Domain.jl b/src/Domain.jl
@@ -212,13 +212,13 @@ function allocate_variables!(
         space = get_attribute(v, :space)
 
         if field_data == UndefinedData
-            if host_dependent(v)
+            if host_dependent(v) && (get_attribute(v, :vfunction, VF_Undefined) == VF_Undefined)
                 field_data = ScalarData
                 set_attribute!(v, :field_data, ScalarData)
                 field_data = get_attribute(v, :field_data)
                 @info "    set :field_data=$field_data for host-dependent Variable $(fullname(v))"
             else
-                error("allocate_variables! :field_data=UndefinedData for Variable $(fullname(v))")
+                error("allocate_variables! :field_data=UndefinedData for Variable $(fullname(v)) $v")
             end
         end
         v_field = allocate_field(