merged in current master

2020-01-13 10:34:31 -07:00
parent bf20d72fc3
commit e8d11931ec
2720 changed files with 221313 additions and 28584 deletions
--- a/lib/atc/ThermalTimeIntegrator.cpp
+++ b/lib/atc/ThermalTimeIntegrator.cpp
@ -28,7 +28,7 @@ namespace ATC {
  //  modify
  //    parses inputs and modifies state of the integrator
  //--------------------------------------------------------
-  bool ThermalTimeIntegrator::modify(int narg, char **arg)
+  bool ThermalTimeIntegrator::modify(int /* narg */, char **arg)
  {
    bool foundMatch = false;
    int argIndex = 0;
@ -570,7 +570,7 @@ namespace ATC {
  //  compute_temperature_delta
  //--------------------------------------------------------
  void ThermalTimeIntegratorFractionalStep::compute_temperature_delta(const DENS_MAT & atomicEnergyDelta,
-                                                                      double dt)
+                                                                      double /* dt */)
  {
    DENS_MAT & myAtomicTemperatureDelta(atomicTemperatureDelta_.set_quantity());
    myAtomicTemperatureDelta = nodalAtomicEnergyOld_.quantity() + atomicEnergyDelta;