Attention une mise à jour du service Gitlab va être effectuée le mardi 18 janvier (et non lundi 17 comme annoncé précédemment) entre 18h00 et 18h30. Cette mise à jour va générer une interruption du service dont nous ne maîtrisons pas complètement la durée mais qui ne devrait pas excéder quelques minutes.

Commit 0536b562 authored by GIRAUDET Chloe's avatar GIRAUDET Chloe
Browse files

#0 Fix Microsphere Hermite rhs and tangent contributions.

parent 96f59481
Pipeline #202731 failed with stages
in 0 seconds
......@@ -40,7 +40,7 @@
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
buildConfiguration = "Release"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
......
......@@ -346,7 +346,6 @@ namespace MoReFEM
// d2W = Tangent_without_normalization = d2W_contribution * rxrxrxr
d2W_I4 += d2W_contribution_I4 * rI4xrI4xrI4xrI4;
d2W_I6 += d2W_contribution_I6 * rI6xrI6xrI6xrI6;
} // End loop on the outplane quad point (Hermite quad point)
// Computation of the weight for the normalization : norm_weight = sqrt(pi) * erf(sqrt(2sigma_t)) * sum(exp(sigma_p * cos(2 * phi)))
......@@ -363,10 +362,10 @@ namespace MoReFEM
norm_weight_I6 *= std::sqrt(pi) * std::erf(std::sqrt(2. * transverse_dispersion_I6));
// Computation of the total Piola dW
dW = dW_I4 / norm_weight_I4 + dW_I6 / norm_weight_I6;
dW += dW_I4 / norm_weight_I4 + dW_I6 / norm_weight_I6;
// Computation of the total Tangent d2W
d2W = d2W_I4 / norm_weight_I4 + d2W_I6 / norm_weight_I6;
d2W += d2W_I4 / norm_weight_I4 + d2W_I6 / norm_weight_I6;
}
}
......
......@@ -104,7 +104,7 @@
const auto Nfiber_in_file = NfiberInFile<traits>(fiber_file);
if (Nfiber_in_file != Ncoords_in_domain_program_wise)
throw Exception("Discrepancy between domain and fiber file: "
throw Exception("Discrepancy between domain and fiber file " + fiber_file + ": "
+ std::to_string(Nfiber_in_file) + " were read in the fiber file while "
"the domain was composed of " + std::to_string(Ncoords_in_domain_program_wise) + " vertices.",
__FILE__, __LINE__);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment