Merge branch '0.5.0-release'

grinsfem · Feb 17, 2015 · cf5f77b · cf5f77b
2 parents d9588ef + df00c76
commit cf5f77b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 15 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -1,9 +1,11 @@
-Lead Developer: Paul T. Bauman (pbauman@ices.utexas.edu)
+Lead Developers: Paul T. Bauman (pbauman@buffalo.edu)
+                 Roy H. Stogner (roystgnr@ices.utexas.edu)
 
 Contributors:
 Timo van Opstal
 Timothy R. Adowski
+Vikram Garg
+Chris Haynes
 
 Early contributions from:
 Onkar Sahni
-Roy H. Stogner
diff --git a/CHANGES b/CHANGES
@@ -1,6 +1,29 @@
-Version 0.5.0 (in progress)
+Version 0.5.0
+https://github.com/grinsfem/grins/releases/tag/v0.5.0
+
+  * Last GRINS version to support libMesh 0.9.4, future versions will
+    require libMesh >= 1.0.0
+  * Refactored viscosity and conductivity handling to support using
+    ParsedFunctions
   * Complete refactoring of postprocessing
     - Now each Physics registers its own postprocessing variables 
+  * Added ElasticMembrane and ElasticMembraneConstantPressure Physics
+    - Supports two-dimensional manifolds
+    - Templated around the stress-strain law
+    - Have implemented Hooke's law and incompressible hyperelastic materials
+    - Compressible materials supported, but no explicit stress-strain laws yet
+    - Example/tests include stretched elastic sheet (displacement controlled) and
+      an inflating sheet under constant pressure
+    - Jacobians/derivatives implemented
+    - Some boundary condition support
+   * Complete refactoring of postprocessing
+    - Now each Physics registers its own postprocessing variables
+   * Added ElasticCable and ElasticCableConstantGravity Physics
+    - Supports one-dimensional manifolds
+    - Currently only supporting Hooke's law
+    - Jacobians/derivatives included
+   * Updated Doxygen generation to better include all code documentation
+   * Variety of bugfixes
 
 Version 0.4.0
 https://github.com/grinsfem/grins/releases/tag/v0.4.0

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -234,6 +234,8 @@ inflatingsheetdir = $(prefix)/examples/inflating_sheet
 inflatingsheet_PROGRAMS = sheet
 inflatingsheet_DATA  = $(top_srcdir)/examples/inflating_sheet/sheet.in
 inflatingsheet_DATA += $(top_srcdir)/examples/inflating_sheet/sheet_coarse.e
+inflatingsheet_DATA += $(top_srcdir)/examples/inflating_sheet/inflating_sheet_solver_factory.h
+inflatingsheet_DATA += $(top_srcdir)/examples/inflating_sheet/pressure_continuation_solver.h
 inflatingsheet_SCRIPTS = $(top_builddir)/examples/inflating_sheet/run.sh
 
 EXTRA_DIST += $(inflatingsheet_DATA)

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -251,6 +251,7 @@ include_HEADERS += physics/include/grins/inc_navier_stokes.h
 include_HEADERS += physics/include/grins/inc_navier_stokes_stab_base.h
 include_HEADERS += physics/include/grins/inc_navier_stokes_adjoint_stab.h
 include_HEADERS += physics/include/grins/inc_navier_stokes_spgsm_stab.h
+include_HEADERS += physics/include/grins/heat_transfer_macros.h
 include_HEADERS += physics/include/grins/heat_transfer_base.h
 include_HEADERS += physics/include/grins/heat_transfer.h
 include_HEADERS += physics/include/grins/heat_transfer_source.h

diff --git a/src/physics/src/elastic_cable.C b/src/physics/src/elastic_cable.C
@@ -439,7 +439,7 @@ namespace GRINS
   template<typename StressStrainLaw>
   void ElasticCable<StressStrainLaw>::compute_metric_tensors( unsigned int qp,
                                                                  const libMesh::FEBase& elem,
-																 const AssemblyContext& context,
+                                                              const AssemblyContext& /*context*/,
                                                                  const libMesh::Gradient& grad_u,
 																 const libMesh::Gradient& grad_v,
 																 const libMesh::Gradient& grad_w,
@@ -465,8 +465,6 @@ namespace GRINS
     a_cov(1,1)    = 1.0;
 	a_cov(2,2)    = 1.0;
 
-    libMesh::Real det_a = a_cov(0,0)*a_cov(1,1) - a_cov(0,1)*a_cov(1,0);
-
     // Covariant metric tensor of current configuration
     A_cov.zero();
     A_cov(0,0) = (dxdxi[qp] + dudxi)*(dxdxi[qp] + dudxi);
@@ -478,14 +476,14 @@ namespace GRINS
 	a_contra(2,2) = 1.0;
 
     // Contravariant metric tensor in current configuration is A_cov^{-1}
-    libMesh::Real det_A = A_cov(0,0)*A_cov(1,1) - A_cov(0,1)*A_cov(1,0);
     A_contra.zero();
     A_contra(0,0) =  1/A_cov(1,1);
 
     // If the material is compressible, then lambda_sq is an independent variable
     if( _is_compressible )
 	{
-    	lambda_sq = context.interior_value(this->_is_compressible, qp);
+          libmesh_not_implemented();
+          //lambda_sq = context.interior_value(this->_lambda_sq_var, qp);
 	}
     else
 	{

diff --git a/src/physics/src/physics_factory.C b/src/physics/src/physics_factory.C
@@ -430,14 +430,13 @@ namespace GRINS
         if( elasticity_model == std::string("HookesLaw") )
           {
             physics_list[physics_to_add] =
-              // We need to track \lambda as an indendent variable
-              PhysicsPtr(new ElasticMembrane<HookesLaw>(physics_to_add,input,true));
+              PhysicsPtr(new ElasticMembrane<HookesLaw>(physics_to_add,input,false /*is_compressible*/));
           }
         else if( elasticity_model == std::string("MooneyRivlin") )
           {
             physics_list[physics_to_add] =
               // \lambda determined from incompressiblity
-              PhysicsPtr(new ElasticMembrane<IncompressiblePlaneStressHyperelasticity<MooneyRivlin> >(physics_to_add,input,false));
+              PhysicsPtr(new ElasticMembrane<IncompressiblePlaneStressHyperelasticity<MooneyRivlin> >(physics_to_add,input,false /*is_compressible*/));
           }
         else
           {
@@ -458,8 +457,7 @@ namespace GRINS
         if( elasticity_model == std::string("HookesLaw") )
           {
             physics_list[physics_to_add] =
-              // We need to track \lambda as an indendent variable
-              PhysicsPtr(new ElasticCable<HookesLaw>(physics_to_add,input,true));
+              PhysicsPtr(new ElasticCable<HookesLaw>(physics_to_add,input,false /*is_compressible*/));
           }
         else
           {

diff --git a/test/input_files/suspended_cable_test.in b/test/input_files/suspended_cable_test.in
@@ -64,7 +64,7 @@ use_numerical_jacobians_only = 'false'
 
 # Visualization options
 [vis-options]
-output_vis = 'true'
+output_vis = 'false'
 
 vis_output_file_prefix = 'cable' 
 

diff --git a/test/test_stokes_poiseuille_flow_parsed_viscosity_parsed_conductivity.C b/test/test_stokes_poiseuille_flow_parsed_viscosity_parsed_conductivity.C
@@ -188,7 +188,7 @@ exact_solution( const libMesh::Point& p,
   const double x = p(0);
   const double y = p(1);
 
-  libMesh::Number f;
+  libMesh::Number f = 0.0;
   // Hardcoded to velocity in input file.
   if( var == "u" ) f = 4*y*(1-y);
   if( var == "p" ) f = 120.0 + (80.0-120.0)/5.0*x;