added a humidity spec and MaterialCompounds ambuiguity solution

longemen3000 · Oct 25, 2020 · 741efd4 · 741efd4
1 parent 54db48b
commit 741efd4
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/state_type.jl b/src/state_type.jl
@@ -104,12 +104,20 @@ function _state_from_type(x::Type{ThermodynamicState{S,C}}) where {S,C}
             has_compound = true
             comp_spec = spec 
             break
-        elseif spec isa HumiditySpec
+        end
+    end
+
+    #double iteration, used in moist air to create an invalid
+    #state where compound and humidity spec are present
+    #in this case, the resulting type is MultiPT instead of HumPT
+    for spec in state_specs
+        if (spec isa HumiditySpec) & !has_compound
             has_compound = true
             comp_spec = spec 
             break
         end
     end
+
     if !has_compound
         comp_spec = SingleComponent()
     end