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/ElectronDragPower.cpp
+++ b/lib/atc/ElectronDragPower.cpp
@ -39,7 +39,7 @@ ElectronDragPowerLinear::ElectronDragPowerLinear(fstream &fileId,
 }

  bool ElectronDragPowerLinear::electron_drag_power(const FIELD_MATS &fields,
-                                                    const GRAD_FIELD_MATS &gradFields,
+                                                    const GRAD_FIELD_MATS & /* gradFields */,
                                                    DENS_MAT & flux)
 {