Merge pull request #18 from BattMoTeam/bruggeman_prm

Make Bruggeman non-hardcoded / parameter in elyte

Author: xavierr

src/models/battmo_types.jl

@@ -37,6 +37,9 @@ minimum_value(::C)   = 0.
 # relative_increment_limit(::C) = 0.1
 
 struct Temperature <: Potential end
+struct BruggemanCoefficient <: ScalarVariable end
+
+Jutul.default_value(model, ::BruggemanCoefficient) = 1.5
 
 struct Conductivity <: ScalarVariable end
 struct Diffusivity <: ScalarVariable end

src/models/elyte.jl

@@ -60,8 +60,9 @@ function select_parameters!(S                  ,
                             )
 
     S[:Temperature]    = Temperature()
+    S[:BruggemanCoefficient] = BruggemanCoefficient()
     S[:VolumeFraction] = VolumeFraction()
-    
+
 end
 
 function select_equations!(eqs                ,
@@ -201,37 +202,37 @@ end
 
 # ? Does this maybe look better ?
 @jutul_secondary(
-function update_conductivity!(kappa, kappa_def::Conductivity, model::ElectrolyteModel, Temperature, C, VolumeFraction, ix)
+function update_conductivity!(kappa, kappa_def::Conductivity, model::ElectrolyteModel, Temperature, C, VolumeFraction, BruggemanCoefficient, ix)
     """ Register conductivity function
     """
 
     # We use Bruggeman coefficient
     for i in ix
-        
+        b = BruggemanCoefficient[i]
         if Jutul.haskey(model.system.params, :conductivity_data)
 
-            @inbounds kappa[i] = model.system[:conductivity_func](C[i]) * VolumeFraction[i]^1.5
+            @inbounds kappa[i] = model.system[:conductivity_func](C[i]) * VolumeFraction[i]^b
 
         else
-            @inbounds kappa[i] = model.system[:conductivity_func](C[i], Temperature[i]) * VolumeFraction[i]^1.5
+            @inbounds kappa[i] = model.system[:conductivity_func](C[i], Temperature[i]) * VolumeFraction[i]^b
         end
     end
 end
 )
 
-@jutul_secondary function update_diffusivity!(D, D_def::Diffusivity, model::ElectrolyteModel, C, Temperature, VolumeFraction, ix)
+@jutul_secondary function update_diffusivity!(D, D_def::Diffusivity, model::ElectrolyteModel, C, Temperature, VolumeFraction, BruggemanCoefficient, ix)
     """ Register diffusivity function
     """
 
     for i in ix
-
+        b = BruggemanCoefficient[i]
         if Jutul.haskey(model.system.params, :diffusivity_data)
 
-            @inbounds D[i] = model.system[:diffusivity_func](C[i])*VolumeFraction[i]^1.5
+            @inbounds D[i] = model.system[:diffusivity_func](C[i])*VolumeFraction[i]^b
 
         else
 
-            @inbounds D[i] = model.system[:diffusivity_func](C[i], Temperature[i])*VolumeFraction[i]^1.5
+            @inbounds D[i] = model.system[:diffusivity_func](C[i], Temperature[i])*VolumeFraction[i]^b
         end
 
     end

src/setup/model_setup.jl

@@ -629,6 +629,7 @@ function setup_battery_parameters(inputparams::InputParams,
 
     prm_elyte = Dict{Symbol, Any}()
     prm_elyte[:Temperature] = T0 
+    prm_elyte[:BruggemanCoefficient] = inputparams["Electrolyte"]["bruggemanCoefficient"]
 
 
     parameters[:Elyte] = setup_parameters(model[:Elyte], prm_elyte)