Whitespace changes from make reindent

grinsfem · Dec 16, 2017 · 6eab634 · 6eab634
1 parent 40afa91
commit 6eab634
Show file tree

Hide file tree

Showing 30 changed files with 112 additions and 112 deletions.
diff --git a/src/boundary_conditions/include/grins/catalytic_wall_base.h b/src/boundary_conditions/include/grins/catalytic_wall_base.h
@@ -83,7 +83,7 @@ namespace GRINS
     libMesh::Real domega_dot_dT( const libMesh::Real rho_s, const libMesh::Real T ) const;
 
     void set_catalycity_params( const std::vector<libMesh::Real>& params );
-    
+
     virtual void register_parameter(  const std::string & param_name,
                                       libMesh::ParameterMultiAccessor< libMesh::Number > & param_pointer) const;
 

diff --git a/src/boundary_conditions/include/grins/neumann_bc_abstract.h b/src/boundary_conditions/include/grins/neumann_bc_abstract.h
@@ -42,7 +42,7 @@ namespace GRINS
   public:
 
     NeumannBCAbstract()
-    : ParameterUser("NeumannBCAbstract")
+      : ParameterUser("NeumannBCAbstract")
     {}
 
     virtual ~NeumannBCAbstract(){};

diff --git a/src/boundary_conditions/src/catalycity_base.C b/src/boundary_conditions/src/catalycity_base.C
@@ -29,7 +29,7 @@
 namespace GRINS
 {
   CatalycityBase::CatalycityBase()
-  : ParameterUser("CatalycityBase")
+    : ParameterUser("CatalycityBase")
   {
     return;
   }

diff --git a/src/physics/include/grins/antioch_instantiation_macro.h b/src/physics/include/grins/antioch_instantiation_macro.h
@@ -29,45 +29,45 @@
 
 #ifdef GRINS_HAVE_ANTIOCH
 
-#define INSTANTIATE_ANTIOCH_TRANSPORT_RAW(class_name,curve_fit) \
-  template class GRINS::class_name<curve_fit, \
+#define INSTANTIATE_ANTIOCH_TRANSPORT_RAW(class_name,curve_fit)         \
+  template class GRINS::class_name<curve_fit,                           \
                                    Antioch::StatMechThermodynamics<libMesh::Real>, \
                                    Antioch::SutherlandViscosity<libMesh::Real>, \
                                    Antioch::EuckenThermalConductivity<Antioch::StatMechThermodynamics<libMesh::Real> >, \
                                    Antioch::ConstantLewisDiffusivity<libMesh::Real> >; \
-  template class GRINS::class_name<curve_fit, \
+  template class GRINS::class_name<curve_fit,                           \
                                    Antioch::StatMechThermodynamics<libMesh::Real>, \
                                    Antioch::BlottnerViscosity<libMesh::Real>, \
                                    Antioch::EuckenThermalConductivity<Antioch::StatMechThermodynamics<libMesh::Real> >, \
                                    Antioch::ConstantLewisDiffusivity<libMesh::Real> >; \
-  template class GRINS::class_name<curve_fit, \
+  template class GRINS::class_name<curve_fit,                           \
                                    Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,curve_fit>, libMesh::Real>, \
                                    Antioch::SutherlandViscosity<libMesh::Real>, \
                                    Antioch::EuckenThermalConductivity<Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,curve_fit>, libMesh::Real> >, \
                                    Antioch::ConstantLewisDiffusivity<libMesh::Real> >; \
-  template class GRINS::class_name<curve_fit, \
+  template class GRINS::class_name<curve_fit,                           \
                                    Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,curve_fit>, libMesh::Real>, \
                                    Antioch::BlottnerViscosity<libMesh::Real>, \
                                    Antioch::EuckenThermalConductivity<Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,curve_fit>, libMesh::Real> >, \
                                    Antioch::ConstantLewisDiffusivity<libMesh::Real> >
 
-#define INSTANTIATE_ANTIOCH_TRANSPORT(class_name) \
+#define INSTANTIATE_ANTIOCH_TRANSPORT(class_name)                       \
   INSTANTIATE_ANTIOCH_TRANSPORT_RAW(class_name,Antioch::CEACurveFit<libMesh::Real>)
 
 #ifdef ANTIOCH_HAVE_GSL
 #define INSTANTIATE_ANTIOCH_KINETICS_THEORY_TRANSPORT_RAW(class_name,curve_fit) \
-  template class GRINS::class_name<curve_fit, \
+  template class GRINS::class_name<curve_fit,                           \
                                    Antioch::StatMechThermodynamics<libMesh::Real>, \
                                    Antioch::KineticsTheoryViscosity<libMesh::Real,Antioch::GSLSpliner>, \
                                    Antioch::KineticsTheoryThermalConductivity<Antioch::StatMechThermodynamics<libMesh::Real>,libMesh::Real>, \
                                    Antioch::MolecularBinaryDiffusion<libMesh::Real,Antioch::GSLSpliner> >; \
-  template class GRINS::class_name<curve_fit, \
+  template class GRINS::class_name<curve_fit,                           \
                                    Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,curve_fit>, libMesh::Real>, \
                                    Antioch::KineticsTheoryViscosity<libMesh::Real,Antioch::GSLSpliner>, \
                                    Antioch::KineticsTheoryThermalConductivity<Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,curve_fit> >,libMesh::Real>, \
                                    Antioch::MolecularBinaryDiffusion<libMesh::Real,Antioch::GSLSpliner> >
 
-#define INSTANTIATE_ANTIOCH_KINETICS_THEORY_TRANSPORT(class_name) \
+#define INSTANTIATE_ANTIOCH_KINETICS_THEORY_TRANSPORT(class_name)       \
   INSTANTIATE_ANTIOCH_KINETICS_THEORY_TRANSPORT_RAW(class_name,Antioch::CEACurveFit<libMesh::Real>)
 
 #endif // ANTIOCH_HAVE_GSL

diff --git a/src/physics/include/grins/physics_factory_reacting_flows.h b/src/physics/include/grins/physics_factory_reacting_flows.h
@@ -83,39 +83,39 @@ namespace GRINS
       if( (diffusivity_model == AntiochOptions::constant_lewis_diffusivity_model()) &&
           (conductivity_model == AntiochOptions::eucken_conductivity_model()) &&
           (viscosity_model == AntiochOptions::sutherland_viscosity_model()) )
-      {
-        this->build_mix_avged_physics_ptr<KineticsThermo,
-                                          Thermo,
-                                          Antioch::SutherlandViscosity<libMesh::Real>,
-                                          Antioch::EuckenThermalConductivity<Thermo>,
-                                          Antioch::ConstantLewisDiffusivity<libMesh::Real> >(input,physics_name,material,new_physics);
-      }
-    else if( (diffusivity_model == AntiochOptions::constant_lewis_diffusivity_model()) &&
-             (conductivity_model == AntiochOptions::eucken_conductivity_model()) &&
-             (viscosity_model == AntiochOptions::blottner_viscosity_model()) )
-      {
-        this->build_mix_avged_physics_ptr<KineticsThermo,
-                                          Thermo,
-                                          Antioch::BlottnerViscosity<libMesh::Real>,
-                                          Antioch::EuckenThermalConductivity<Thermo>,
-                                          Antioch::ConstantLewisDiffusivity<libMesh::Real> >(input,physics_name,material,new_physics);
-      }
-    else if( (diffusivity_model == AntiochOptions::kinetic_theory_diffusivity_model()) &&
-             (conductivity_model == AntiochOptions::kinetic_theory_conductivity_model()) &&
-             (viscosity_model == AntiochOptions::kinetic_theory_viscosity_model()) )
-      {
+        {
+          this->build_mix_avged_physics_ptr<KineticsThermo,
+                                            Thermo,
+                                            Antioch::SutherlandViscosity<libMesh::Real>,
+                                            Antioch::EuckenThermalConductivity<Thermo>,
+                                            Antioch::ConstantLewisDiffusivity<libMesh::Real> >(input,physics_name,material,new_physics);
+        }
+      else if( (diffusivity_model == AntiochOptions::constant_lewis_diffusivity_model()) &&
+               (conductivity_model == AntiochOptions::eucken_conductivity_model()) &&
+               (viscosity_model == AntiochOptions::blottner_viscosity_model()) )
+        {
+          this->build_mix_avged_physics_ptr<KineticsThermo,
+                                            Thermo,
+                                            Antioch::BlottnerViscosity<libMesh::Real>,
+                                            Antioch::EuckenThermalConductivity<Thermo>,
+                                            Antioch::ConstantLewisDiffusivity<libMesh::Real> >(input,physics_name,material,new_physics);
+        }
+      else if( (diffusivity_model == AntiochOptions::kinetic_theory_diffusivity_model()) &&
+               (conductivity_model == AntiochOptions::kinetic_theory_conductivity_model()) &&
+               (viscosity_model == AntiochOptions::kinetic_theory_viscosity_model()) )
+        {
 #ifdef ANTIOCH_HAVE_GSL
-        this->build_mix_avged_physics_ptr<KineticsThermo,
-                                          Thermo,
-                                          Antioch::KineticsTheoryViscosity<libMesh::Real,Antioch::GSLSpliner>,
-                                          Antioch::KineticsTheoryThermalConductivity<Thermo,libMesh::Real>,
-                                          Antioch::MolecularBinaryDiffusion<libMesh::Real,Antioch::GSLSpliner> >(input,physics_name,material,new_physics);
+          this->build_mix_avged_physics_ptr<KineticsThermo,
+                                            Thermo,
+                                            Antioch::KineticsTheoryViscosity<libMesh::Real,Antioch::GSLSpliner>,
+                                            Antioch::KineticsTheoryThermalConductivity<Thermo,libMesh::Real>,
+                                            Antioch::MolecularBinaryDiffusion<libMesh::Real,Antioch::GSLSpliner> >(input,physics_name,material,new_physics);
 #else
-        libmesh_error_msg("ERROR: Antioch requires GSL in order to use kinetics theory based models!");
+          libmesh_error_msg("ERROR: Antioch requires GSL in order to use kinetics theory based models!");
 #endif // ANTIOCH_HAVE_GSL
-      }
-    else
-      this->grins_antioch_model_error_msg(viscosity_model,conductivity_model,diffusivity_model);
+        }
+      else
+        this->grins_antioch_model_error_msg(viscosity_model,conductivity_model,diffusivity_model);
     }
 
     template<typename KineticsThermo,typename Thermo>
@@ -153,7 +153,7 @@ namespace GRINS
         gas_mixture = mix_builder.build_mixture<KineticsThermo,Thermo,Viscosity,Conductivity,Diffusivity>(input,material);
 
       new_physics.reset(new DerivedPhysics<AntiochMixtureAveragedTransportMixture<KineticsThermo,Thermo,Viscosity,Conductivity,Diffusivity>,
-                                           AntiochMixtureAveragedTransportEvaluator<KineticsThermo,Thermo,Viscosity,Conductivity,Diffusivity> >
+                        AntiochMixtureAveragedTransportEvaluator<KineticsThermo,Thermo,Viscosity,Conductivity,Diffusivity> >
                         (physics_name,input,gas_mixture) );
     }
 
@@ -167,7 +167,7 @@ namespace GRINS
         gas_mixture = mix_builder.build_mixture<KineticsThermo,Conductivity>(input,material);
 
       new_physics.reset(new DerivedPhysics<AntiochConstantTransportMixture<KineticsThermo,Conductivity>,
-                                           AntiochConstantTransportEvaluator<KineticsThermo,Thermo,Conductivity> >
+                        AntiochConstantTransportEvaluator<KineticsThermo,Thermo,Conductivity> >
                         (physics_name,input,gas_mixture) );
     }
 #endif // GRINS_HAVE_ANTIOCH

diff --git a/src/physics/include/grins/reacting_low_mach_navier_stokes_abstract.h b/src/physics/include/grins/reacting_low_mach_navier_stokes_abstract.h
@@ -78,7 +78,7 @@ namespace GRINS
     PressureFEVariable& _press_var;
     PrimitiveTempFEVariables& _temp_vars;
 
-     SpeciesMassFractionsVariable& _species_vars;
+    SpeciesMassFractionsVariable& _species_vars;
 
     /*! \todo When we mandate C++11, switch this to a SharedPtr. Then, in the VariableWarhouse,
       we can use dynamic_pointer_cast to get a SharedPtr. */

diff --git a/src/physics/include/grins/reacting_low_mach_navier_stokes_macro.h b/src/physics/include/grins/reacting_low_mach_navier_stokes_macro.h
@@ -34,11 +34,11 @@ namespace GRINSPrivate
                                    GRINS::AntiochConstantTransportEvaluator<curve_fit,thermo,GRINS::conductivity> >
 
 #define INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_CURVEFIT_THERMO_RAW(class_name,conductivity) \
-  INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_RAW(class_name,Antioch::CEACurveFit<libMesh::Real>,conductivity,Antioch::StatMechThermodynamics<libMesh::Real>);\
+  INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_RAW(class_name,Antioch::CEACurveFit<libMesh::Real>,conductivity,Antioch::StatMechThermodynamics<libMesh::Real>); \
   INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_RAW(class_name,Antioch::CEACurveFit<libMesh::Real>,conductivity,GRINSPrivate::CEAIdealGasThermo)
 
 #define INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR(class_name) \
-  INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_CURVEFIT_THERMO_RAW(class_name,ConstantConductivity);\
+  INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_CURVEFIT_THERMO_RAW(class_name,ConstantConductivity); \
   INSTANTIATE_REACTING_LOW_MACH_SUBCLASS_CONSTANT_MIXTURE_AND_CONSTANT_EVALUATOR_CURVEFIT_THERMO_RAW(class_name,ConstantPrandtlConductivity)
 
 

diff --git a/src/physics/src/physics_factory_reacting_flows.C b/src/physics/src/physics_factory_reacting_flows.C
@@ -167,7 +167,7 @@ namespace GRINS
         this->build_const_physics_with_thermo<Antioch::CEACurveFit<libMesh::Real>,
                                               Antioch::IdealGasMicroThermo<Antioch::NASAEvaluator<libMesh::Real,Antioch::CEACurveFit<libMesh::Real> > > >
           (input,physics_name,material,conductivity_model,new_physics);
-       }
+      }
     else
       this->grins_antioch_model_error_msg(viscosity_model,conductivity_model,diffusivity_model);
   }

diff --git a/src/properties/include/grins/antioch_constant_transport_evaluator.h b/src/properties/include/grins/antioch_constant_transport_evaluator.h
@@ -49,7 +49,7 @@ namespace GRINS
     By default, Antioch is working in SI units. Note that this documentation will always
     be built regardless if Antioch is included in the GRINS build or not. Check configure
     output to confirm that Antioch was included in the build.
-   */
+  */
   template<typename KineticsThermoCurveFit, typename Thermo, typename Conductivity>
   class AntiochConstantTransportEvaluator : public AntiochEvaluator<KineticsThermoCurveFit,Thermo>
   {

diff --git a/src/properties/include/grins/antioch_constant_transport_mixture.h b/src/properties/include/grins/antioch_constant_transport_mixture.h
@@ -53,7 +53,7 @@ namespace GRINS
     By default, Antioch is working in SI units. Note that this documentation will always
     be built regardless if Antioch is included in the GRINS build or not. Check configure
     output to confirm that Antioch was included in the build.
-   */
+  */
   template<typename KineticsThermoCurveFit,typename Conductivity>
   class AntiochConstantTransportMixture : public AntiochMixture<KineticsThermoCurveFit>
   {

diff --git a/src/properties/include/grins/antioch_evaluator.h b/src/properties/include/grins/antioch_evaluator.h
@@ -51,7 +51,7 @@ namespace GRINS
     By default, Antioch is working in SI units. Note that this documentation will always
     be built regardless if Antioch is included in the GRINS build or not. Check configure
     output to confirm that Antioch was included in the build.
-   */
+  */
   template<typename KineticsThermoCurveFit, typename Thermo>
   class AntiochEvaluator
   {

diff --git a/src/properties/include/grins/antioch_kinetics.h b/src/properties/include/grins/antioch_kinetics.h
@@ -54,7 +54,7 @@ namespace GRINS
     By default, Antioch is working in SI units. Note that this documentation will always
     be built regardless if Antioch is included in the GRINS build or not. Check configure
     output to confirm that Antioch was included in the build.
-   */
+  */
   template<typename KineticsThermoCurveFit>
   class AntiochKinetics
   {

diff --git a/src/properties/include/grins/antioch_mixture.h b/src/properties/include/grins/antioch_mixture.h
@@ -61,7 +61,7 @@ namespace GRINS
     By default, Antioch is working in SI units. Note that this documentation will always
     be built regardless if Antioch is included in the GRINS build or not. Check configure
     output to confirm that Antioch was included in the build.
-   */
+  */
   template <typename KineticsThermoCurveFit>
   class AntiochMixture : public AntiochChemistry
   {
@@ -73,7 +73,7 @@ namespace GRINS
 
     //! Constructor with user-built objects
     /*! This constructor expects the user to pass in a ChemicalMixture, ReactionSet, and NASAThermoMixture
-        object already built; this class will take ownership of the pointer. */
+      object already built; this class will take ownership of the pointer. */
     AntiochMixture( libMesh::UniquePtr<Antioch::ChemicalMixture<libMesh::Real> > & chem_mixture,
                     libMesh::UniquePtr<Antioch::ReactionSet<libMesh::Real> > & reaction_set,
                     libMesh::UniquePtr<Antioch::NASAThermoMixture<libMesh::Real,KineticsThermoCurveFit> > & nasa_mixture,

diff --git a/src/properties/include/grins/antioch_mixture_averaged_transport_evaluator.h b/src/properties/include/grins/antioch_mixture_averaged_transport_evaluator.h
@@ -49,7 +49,7 @@ namespace GRINS
     By default, Antioch is working in SI units. Note that this documentation will always
     be built regardless if Antioch is included in the GRINS build or not. Check configure
     output to confirm that Antioch was included in the build.
-   */
+  */
   template<typename KineticsThermoCurveFit, typename Thermo, typename Viscosity, typename Conductivity, typename Diffusivity>
   class AntiochMixtureAveragedTransportEvaluator : public AntiochEvaluator<Antioch::CEACurveFit<libMesh::Real>,Thermo>
   {

diff --git a/src/properties/include/grins/antioch_mixture_builder_base.h b/src/properties/include/grins/antioch_mixture_builder_base.h
@@ -57,8 +57,8 @@ namespace GRINS
 {
   //! Base class building Antioch mixture wrappers
   /*! This class only worries about building the kinetics
-      and the thermo associated with kinetics. Subclasses
-      will handle thermo and transport. */
+    and the thermo associated with kinetics. Subclasses
+    will handle thermo and transport. */
   class AntiochMixtureBuilderBase
   {
   public:

diff --git a/src/properties/include/grins/antioch_thermo_curve_fit_instantiation_macro.h b/src/properties/include/grins/antioch_thermo_curve_fit_instantiation_macro.h
@@ -29,7 +29,7 @@
 
 #ifdef GRINS_HAVE_ANTIOCH
 
-#define INSTANTIATE_ANTIOCH_THERMO_CURVE_FIT(class_name) \
+#define INSTANTIATE_ANTIOCH_THERMO_CURVE_FIT(class_name)                \
   template class GRINS::class_name<Antioch::CEACurveFit<libMesh::Real> >; \
   template class GRINS::class_name<Antioch::NASA7CurveFit<libMesh::Real> >; \
   template class GRINS::class_name<Antioch::NASA9CurveFit<libMesh::Real> >

diff --git a/src/properties/src/antioch_constant_transport_evaluator.C b/src/properties/src/antioch_constant_transport_evaluator.C
@@ -38,9 +38,9 @@ namespace GRINS
   template<typename Thermo, typename Conductivity>
   AntiochConstantTransportEvaluator<Thermo,Conductivity>::AntiochConstantTransportEvaluator( const AntiochConstantTransportMixture<Conductivity>& mixture )
     : AntiochEvaluator<Antioch::CEACurveFit<libMesh::Real>,Thermo>( mixture ),
-      _mu( mixture.mu() ),
-      _conductivity( mixture.conductivity() ),
-      _diffusivity( mixture.diffusivity() )
+    _mu( mixture.mu() ),
+    _conductivity( mixture.conductivity() ),
+    _diffusivity( mixture.diffusivity() )
   {
     return;
   }

diff --git a/src/properties/src/antioch_constant_transport_mixture.C b/src/properties/src/antioch_constant_transport_mixture.C
@@ -67,7 +67,7 @@ namespace GRINS
     libMesh::UniquePtr<Antioch::ConstantLewisDiffusivity<libMesh::Real> > & diff,
     libMesh::Real min_T,
     bool clip_negative_rho )
-    : AntiochMixture<KineticsThermoCurveFit>(chem_mixture,reaction_set,nasa_mixture,min_T,clip_negative_rho)
+  : AntiochMixture<KineticsThermoCurveFit>(chem_mixture,reaction_set,nasa_mixture,min_T,clip_negative_rho)
   {
     /*! \todo Use std::move() when we have C++11 */
     _mu.reset( visc.release() );

diff --git a/src/properties/src/antioch_evaluator.C b/src/properties/src/antioch_evaluator.C
@@ -93,16 +93,16 @@ namespace GRINS
 
   template<>
   libMesh::Real AntiochEvaluator<Antioch::CEACurveFit<libMesh::Real>,Antioch::StatMechThermodynamics<libMesh::Real> >::cp( const libMesh::Real& T,
-                                                                                       const libMesh::Real /*P*/,
-                                                                                       const std::vector<libMesh::Real>& Y )
+                                                                                                                           const libMesh::Real /*P*/,
+                                                                                                                           const std::vector<libMesh::Real>& Y )
   {
     return this->_thermo->cp( T, T, Y );
   }
 
   template<>
   libMesh::Real AntiochEvaluator<Antioch::CEACurveFit<libMesh::Real>,Antioch::StatMechThermodynamics<libMesh::Real> >::cv( const libMesh::Real& T,
-                                                                                       const libMesh::Real /*P*/,
-                                                                                       const std::vector<libMesh::Real>& Y )
+                                                                                                                           const libMesh::Real /*P*/,
+                                                                                                                           const std::vector<libMesh::Real>& Y )
   {
     return this->_thermo->cv( T, T, Y );
   }

diff --git a/src/properties/src/antioch_mixture.C b/src/properties/src/antioch_mixture.C
@@ -99,8 +99,8 @@ namespace GRINS
 
   template <typename KineticsThermoCurveFit>
   void AntiochMixture<KineticsThermoCurveFit>::register_parameter
-    ( const std::string & param_name,
-      libMesh::ParameterMultiAccessor<libMesh::Number> & param_pointer ) const
+  ( const std::string & param_name,
+    libMesh::ParameterMultiAccessor<libMesh::Number> & param_pointer ) const
   {
     // Use common code for any GRINS parameters
     AntiochChemistry::register_parameter(param_name, param_pointer);