Skip to content
Snippets Groups Projects
Commit 4c8c8131 authored by Ludovic Noels's avatar Ludovic Noels
Browse files

bugs in compilation from merge

parent 3a4652f6
No related branches found
No related tags found
No related merge requests found
...@@ -61,6 +61,7 @@ set(SRC ...@@ -61,6 +61,7 @@ set(SRC
ipVoidState.cpp ipVoidState.cpp
ipLinearElecMagInductor.cpp ipLinearElecMagInductor.cpp
ipGenericTM.cpp ipGenericTM.cpp
ipGenericRM.cpp
ipElecMagGenericThermoMech.cpp ipElecMagGenericThermoMech.cpp
ipElecMagInductor.cpp ipElecMagInductor.cpp
ipNonLinearTVM.cpp ipNonLinearTVM.cpp
......
...@@ -101,6 +101,7 @@ set(SRC ...@@ -101,6 +101,7 @@ set(SRC
mlawNonLocalPorousWithFailure.cpp mlawNonLocalPorousWithFailure.cpp
mlawLinearElecMagInductor.cpp mlawLinearElecMagInductor.cpp
mlawGenericTM.cpp mlawGenericTM.cpp
mlawGenericRM.cpp
mlawElecMagGenericThermoMech.cpp mlawElecMagGenericThermoMech.cpp
mlawElecMagInductor.cpp mlawElecMagInductor.cpp
mlawNonLinearTVM.cpp mlawNonLinearTVM.cpp
......
...@@ -33,7 +33,7 @@ class materialLaw{ ...@@ -33,7 +33,7 @@ class materialLaw{
hyperelastic, powerYieldLaw, powerYieldLawWithFailure,nonLocalDamagePowerYieldHyper, hyperelastic, powerYieldLaw, powerYieldLawWithFailure,nonLocalDamagePowerYieldHyper,
localDamagePowerYieldHyperWithFailure,nonLocalDamagePowerYieldHyperWithFailure,ElecSMP, localDamagePowerYieldHyperWithFailure,nonLocalDamagePowerYieldHyperWithFailure,ElecSMP,
ThermalConducter,AnIsotropicTherMech, localDamageJ2Hyper,linearElastic,nonLocalDamageGursonThermoMechanics, ThermalConducter,AnIsotropicTherMech, localDamageJ2Hyper,linearElastic,nonLocalDamageGursonThermoMechanics,
localDamageJ2SmallStrain,nonLocalDamageJ2SmallStrain,cluster,tfa,ANN, DMN, torchANN, NonlocalDamageTorchANN, StochDMN, LinearElecMagTherMech, LinearElecMagInductor, hyperviscoelastic, localDamageJ2SmallStrain,nonLocalDamageJ2SmallStrain,cluster,tfa,ANN, DMN, torchANN, NonlocalDamageTorchANN, StochDMN, LinearElecMagTherMech, LinearElecMagInductor, hyperviscoelastic, GenericResidualStrain,
GenericThermoMechanics, ElecMagGenericThermoMechanics, ElecMagInductor, GenericThermoMechanics, ElecMagGenericThermoMechanics, ElecMagInductor,
nonlineartvm,nonlinearTVE,nonlinearTVP,vevpmfh, VEVPUMAT, IMDEACPUMAT, Hill48,nonlinearTVEnonlinearTVP,nonlinearTVEnonlinearTVP2, nonlineartvm,nonlinearTVE,nonlinearTVP,vevpmfh, VEVPUMAT, IMDEACPUMAT, Hill48,nonlinearTVEnonlinearTVP,nonlinearTVEnonlinearTVP2,
MultipleLaws}; MultipleLaws};
......
...@@ -65,7 +65,9 @@ ...@@ -65,7 +65,9 @@
#include "mlawLocalDamageJ2SmallStrain.h" #include "mlawLocalDamageJ2SmallStrain.h"
#include "mlawLocalDamageIsotropicElasticity.h" #include "mlawLocalDamageIsotropicElasticity.h"
#include "ipGenericTM.h" #include "ipGenericTM.h"
#include "ipGenericRM.h"
#include "mlawGenericTM.h" #include "mlawGenericTM.h"
#include "mlawGenericRM.h"
#include "ipElecMagGenericThermoMech.h" #include "ipElecMagGenericThermoMech.h"
#include "mlawElecMagGenericThermoMech.h" #include "mlawElecMagGenericThermoMech.h"
#include "ipElecMagInductor.h" #include "ipElecMagInductor.h"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment