diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index 2dae61f34..cbe8c439a 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -45,17 +45,17 @@ module subroutine elastic_init(phases) associate(prm => param(ph)) - prm%C_11 = polynomial(elastic%asDict(),'C_11','T') - prm%C_12 = polynomial(elastic%asDict(),'C_12','T') - prm%C_44 = polynomial(elastic%asDict(),'C_44','T') + prm%C_11 = polynomial(elastic,'C_11','T') + prm%C_12 = polynomial(elastic,'C_12','T') + prm%C_44 = polynomial(elastic,'C_44','T') if (any(phase_lattice(ph) == ['hP','tI'])) then - prm%C_13 = polynomial(elastic%asDict(),'C_13','T') - prm%C_33 = polynomial(elastic%asDict(),'C_33','T') + prm%C_13 = polynomial(elastic,'C_13','T') + prm%C_33 = polynomial(elastic,'C_33','T') end if if (phase_lattice(ph) == 'tI') & - prm%C_66 = polynomial(elastic%asDict(),'C_66','T') + prm%C_66 = polynomial(elastic,'C_66','T') end associate end do diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index 77f162fef..1e02e7644 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -299,7 +299,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%b_tr = math_expand(prm%b_tr,prm%N_tr) prm%i_tr = pl%get_asFloat('i_tr') - prm%Delta_G = polynomial(pl%asDict(),'Delta_G','T') + prm%Delta_G = polynomial(pl,'Delta_G','T') prm%L_tr = pl%get_asFloat('L_tr') a_cF = prm%b_tr(1)*sqrt(6.0_pReal) ! b_tr is Shockley partial prm%h = 5.0_pReal * a_cF/sqrt(3.0_pReal) @@ -357,7 +357,7 @@ module function plastic_dislotwin_init() result(myPlasticity) end if if (prm%sum_N_tw + prm%sum_N_tr > 0 .or. prm%extendedDislocations) & - prm%Gamma_sf = polynomial(pl%asDict(),'Gamma_sf','T') + prm%Gamma_sf = polynomial(pl,'Gamma_sf','T') slipAndTwinActive: if (prm%sum_N_sl * prm%sum_N_tw > 0) then prm%h_sl_tw = lattice_interaction_SlipByTwin(N_sl,prm%N_tw,pl%get_as1dFloat('h_sl-tw'), & diff --git a/src/polynomials.f90 b/src/polynomials.f90 index 385905b38..38e31eb55 100644 --- a/src/polynomials.f90 +++ b/src/polynomials.f90 @@ -157,7 +157,7 @@ subroutine selfTest() 'C,T^4: '//trim(adjustl(coef_s(5)))//IO_EOL//& 'T_ref: '//trim(adjustl(x_ref_s))//IO_EOL dict => YAML_parse_str_asDict(trim(YAML_s)) - p2 = polynomial(dict%asDict(),'C','T') + p2 = polynomial(dict,'C','T') if (dNeq(p1%at(x),p2%at(x),1.0e-6_pReal)) error stop 'polynomials: init' y = coef(1)+coef(2)*(x-x_ref)+coef(3)*(x-x_ref)**2+coef(4)*(x-x_ref)**3+coef(5)*(x-x_ref)**4 if (dNeq(p1%at(x),y,1.0e-6_pReal)) error stop 'polynomials: eval(full)' @@ -166,28 +166,28 @@ subroutine selfTest() 'C,T: '//trim(adjustl(coef_s(2)))//IO_EOL//& 'T_ref: '//trim(adjustl(x_ref_s))//IO_EOL dict => YAML_parse_str_asDict(trim(YAML_s)) - p1 = polynomial(dict%asDict(),'C','T') + p1 = polynomial(dict,'C','T') if (dNeq(p1%at(x_ref+x),-p1%at(x_ref-x),1.0e-10_pReal)) error stop 'polynomials: eval(linear)' YAML_s = 'C: 0.0'//IO_EOL//& 'C,T^2: '//trim(adjustl(coef_s(3)))//IO_EOL//& 'T_ref: '//trim(adjustl(x_ref_s))//IO_EOL dict => YAML_parse_str_asDict(trim(YAML_s)) - p1 = polynomial(dict%asDict(),'C','T') + p1 = polynomial(dict,'C','T') if (dNeq(p1%at(x_ref+x),p1%at(x_ref-x),1e-10_pReal)) error stop 'polynomials: eval(quadratic)' YAML_s = 'Y: '//trim(adjustl(coef_s(1)))//IO_EOL//& 'Y,X^3: '//trim(adjustl(coef_s(2)))//IO_EOL//& 'X_ref: '//trim(adjustl(x_ref_s))//IO_EOL dict => YAML_parse_str_asDict(trim(YAML_s)) - p1 = polynomial(dict%asDict(),'Y','X') + p1 = polynomial(dict,'Y','X') if (dNeq(p1%at(x_ref+x)-coef(1),-(p1%at(x_ref-x)-coef(1)),1.0e-8_pReal)) error stop 'polynomials: eval(cubic)' YAML_s = 'Y: '//trim(adjustl(coef_s(1)))//IO_EOL//& 'Y,X^4: '//trim(adjustl(coef_s(2)))//IO_EOL//& 'X_ref: '//trim(adjustl(x_ref_s))//IO_EOL dict => YAML_parse_str_asDict(trim(YAML_s)) - p1 = polynomial(dict%asDict(),'Y','X') + p1 = polynomial(dict,'Y','X') if (dNeq(p1%at(x_ref+x),p1%at(x_ref-x),1.0e-6_pReal)) error stop 'polynomials: eval(quartic)'