From 185a4c8e48d86596fe52860eea25a526ef8bae4b Mon Sep 17 00:00:00 2001
From: Stuart Daines <sd336@um-serve>
Date: Thu, 12 May 2022 22:09:30 +0100
Subject: [PATCH] v0.18.1: Bugfix for :field_data default for host dependencies

---
 Project.toml  | 2 +-
 src/Domain.jl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Project.toml b/Project.toml
index 4f502e8..8639310 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "PALEOboxes"
 uuid = "804b410e-d900-4b2a-9ecd-f5a06d4c1fd4"
 authors = ["Stuart Daines <stuart.daines@gmail.com>"]
-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
index beffaeb..556c773 100644
--- 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(