diff --git a/src/micro_common.cpp b/src/micro_common.cpp index 8a96341411bb53f83a168d065015062d1c4d3f39..3dcb18f495ef38a1b1b7c683d33a882912b97cde 100644 --- a/src/micro_common.cpp +++ b/src/micro_common.cpp @@ -310,7 +310,8 @@ void micropp::calc_ctan_lin_mix_rule_Chamis(double ctan[nvoi * nvoi]) const double E22 = Em / (1 - sqrt(Vf) * (1 - Em / Ef)); const double nu12 = Vf * nu_f + Vm * nu_m; const double G12 = Gm / (1 - sqrt(Vf) * (1 - Gm / Gf)); - const double nu23 = E22 / (2 * G12); + //const double nu23 = E22 / (2 * G12); + const double nu23 = nu12; const double S[3][3] = { { 1 / E11, - nu12 / E11, - nu12 / E11 }, diff --git a/test/benchmark-mic-4.cpp b/test/benchmark-mic-4.cpp index 1f98aa3c5da459412b7a0f0606955d4d2a59a0be..59cc9b729b218a2cb4998b27e4d60eaee2b61a27 100644 --- a/test/benchmark-mic-4.cpp +++ b/test/benchmark-mic-4.cpp @@ -81,8 +81,8 @@ int main(int argc, char **argv) mic_params.geo_params[0] = 0.1; mic_params.geo_params[1] = 0.02; mic_params.geo_params[2] = 0.01; - material_set(&mic_params.materials[0], 0, 1.0e7, 0.3, 0.0, 0.0, 0.0); - material_set(&mic_params.materials[1], 0, 3.0e7, 0.3, 0.0, 0.0, 0.0); + material_set(&mic_params.materials[0], 0, 3.0e7, 0.25, 0.0, 0.0, 0.0); + material_set(&mic_params.materials[1], 0, 3.0e8, 0.25, 0.0, 0.0, 0.0); material_set(&mic_params.materials[2], 0, 3.0e7, 0.3, 0.0, 0.0, 0.0); mic_params.lin_stress = true; @@ -152,17 +152,22 @@ int main(int argc, char **argv) } cout << endl; - micro.update_vars(); - - file << eps[dir] << "\t" - << sig[dir] << "\t" << endl; + file << eps[dir] << "\t"; + for (int i = 0; i < 6; ++i) { + file << sig[i] << "\t"; + } + file << sqrt(pow(sig[0], 2) + pow(sig[1], 2) + pow(sig[2], 2) + \ + pow(sig[3], 2) + pow(sig[4], 2) + pow(sig[5], 2)) << "\t" + << endl; if (print) { char filename[128]; snprintf(filename, 128, "micropp_%d", t); - micro.output (0, filename); + micro.output(0, filename); } + micro.update_vars(); + time += dt; }