Merge pull request #4 from maurergroup/data-save

Fix issue with model reassembly functions

Author: MatthiasSachs

src/matrixmodels/matrixmodels.jl

@@ -57,8 +57,9 @@ struct NoZ2Sym <: Z2Symmetry end
 function ACEfrictionCore.write_dict(z2s::Z2S) where {Z2S<:Z2Symmetry}
     return Dict("__id__" => string("ACEfriction_Z2Symmetry"), "z2s"=>typeof(z2s)) 
 end
+
 function ACEfrictionCore.read_dict(::Val{:ACEfriction_Z2Symmetry}, D::Dict) 
-    z2s = getfield(ACEfriction.MatrixModels, Symbol(D["z2s"]))
+    z2s = getfield(ACEfriction.MatrixModels, Symbol(split(D["z2s"], ".")[end])) # This was exporting it's full type, whereas we just need the last node. 
     return z2s()
 end
 abstract type SpeciesCoupling end 
@@ -69,8 +70,9 @@ struct SpeciesUnCoupled <: SpeciesCoupling end
 function ACEfrictionCore.write_dict(sc::SC) where {SC<:SpeciesCoupling}
     return Dict("__id__" => string("ACEfriction_SpeciesCoupling"), "sc"=>typeof(sc)) 
 end
+
 function ACEfrictionCore.read_dict(::Val{:ACEfriction_SpeciesCoupling}, D::Dict) 
-    sc = getfield(ACEfriction.MatrixModels, Symbol(D["sc"]))
+    sc = getfield(ACEfriction.MatrixModels, Symbol(split(D["sc"], ".")[end]))
     return sc()
 end
 
@@ -82,8 +84,9 @@ struct AtomCentered <: EvaluationCenter end
 function ACEfrictionCore.write_dict(evalcenter::EVALCENTER) where {EVALCENTER<:EvaluationCenter}
     return Dict("__id__" => string("ACEfriction_EvaluationMode"), "evalcenter"=>typeof(evalcenter)) 
 end
+  
 function ACEfrictionCore.read_dict(::Val{:ACEfriction_EvaluationMode}, D::Dict) 
-    evalcenter = getfield(ACEfriction.MatrixModels, Symbol(D["evalcenter"]))
+    evalcenter = getfield(ACEfriction.MatrixModels, Symbol(split(D["evalcenter"], ".")[end]))
     return evalcenter()
 end
 
@@ -703,5 +706,4 @@ include("./pwcmatrixmodels.jl")
 # Omsite-only matrix models:
 include("./onsiteonlymatrixmodels.jl")
 
-
-end
+end