bugs in compilation from merge

NonLinearSolver/internalPoints/CMakeLists.txt

@@ -61,6 +61,7 @@ set(SRC
   ipVoidState.cpp
   ipLinearElecMagInductor.cpp
   ipGenericTM.cpp
+  ipGenericRM.cpp
   ipElecMagGenericThermoMech.cpp
   ipElecMagInductor.cpp
   ipNonLinearTVM.cpp

NonLinearSolver/materialLaw/CMakeLists.txt

@@ -101,6 +101,7 @@ set(SRC
   mlawNonLocalPorousWithFailure.cpp
   mlawLinearElecMagInductor.cpp
   mlawGenericTM.cpp
+  mlawGenericRM.cpp
   mlawElecMagGenericThermoMech.cpp
   mlawElecMagInductor.cpp
   mlawNonLinearTVM.cpp

NonLinearSolver/materialLaw/mlaw.h

@@ -33,7 +33,7 @@ class materialLaw{
                  hyperelastic, powerYieldLaw, powerYieldLawWithFailure,nonLocalDamagePowerYieldHyper,
                  localDamagePowerYieldHyperWithFailure,nonLocalDamagePowerYieldHyperWithFailure,ElecSMP,
                  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,
                  nonlineartvm,nonlinearTVE,nonlinearTVP,vevpmfh, VEVPUMAT, IMDEACPUMAT, Hill48,nonlinearTVEnonlinearTVP,nonlinearTVEnonlinearTVP2,
                  MultipleLaws};

dG3D/src/dG3DIPVariable.h

@@ -65,7 +65,9 @@
 #include "mlawLocalDamageJ2SmallStrain.h"
 #include "mlawLocalDamageIsotropicElasticity.h"
 #include "ipGenericTM.h"
+#include "ipGenericRM.h"
 #include "mlawGenericTM.h"
+#include "mlawGenericRM.h"
 #include "ipElecMagGenericThermoMech.h"
 #include "mlawElecMagGenericThermoMech.h"
 #include "ipElecMagInductor.h"