Skip to content

Commit

Permalink
Merge pull request #285 from pbauman/0.6.0-prep
Browse files Browse the repository at this point in the history
0.6.0 prep
  • Loading branch information
pbauman committed May 23, 2015
2 parents d32fc15 + 2779702 commit df90f7a
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 46 deletions.
29 changes: 26 additions & 3 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,8 +1,31 @@
Version 0.6.0 (In progress)
* Added velocitypenalty2 + velocitypenalty3, to support 3d constraints

* Refactored SplitString function and renamed split_string.
String utilities now in StringUtilities namespace.
* Bugfix for variable index initialization. Now if a variable
doesn't get properly initialized, an assert should be thrown.
* Bugfix for axisymmetric case of ReactingLowMachNavierStokes
* New SpalartAllmaras turbulence Physics (thanks to Vikram Garg).
* New ParameterManager capability in development. In conjunction
with computing parameter sensitivities. This is still experimental.
* Fixes for viscosity handling in some stabilization classes.
* Added LIBMESH_RUN capability to test suite. Now, test suite
can be run with MPI.
* Added new SourceFunction Physics for specifying source functions
from the input file (as opposed to manually subclassing).
* Refactored Simulation constructor to take GetPot/command line
object. Previous constructor is deprecated.
* Bug fix in postprocessing
* Refactored mesh specification section of input file. Previous
specification is deprecated. Added example input file in examples.
* Added velocitypenalty2 + velocitypenalty3, to support 3d constraints
* Added 'continue_after_max_iterations' option to parser
* Added velocitypenalty2 + velocitypenalty3, to support 3d constraints
* Added velocitypenalty2 + velocitypenalty3, to support 3d constraints
* Added unused input variable detection. Errors by default for any
detected unused input variables.
* Fix for FlowVariables parsing
* Symmetry boundary conditions for ElasticMembrane
* Bugfixes for mixed ElasticMembrane/Cable case, added regression test
* Refactoring of ElasticCable, HookesLaw for better 1D support

Version 0.5.0
https://github.com/grinsfem/grins/releases/tag/v0.5.0
Expand Down
74 changes: 37 additions & 37 deletions src/bc_handling/src/spalart_allmaras_bc_handling.C
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace GRINS
{

SpalartAllmarasBCHandling::SpalartAllmarasBCHandling(const std::string& physics_name,
const GetPot& input)
const GetPot& input)
: BCHandlingBase(physics_name),
_turb_vars(input)
{
Expand All @@ -46,7 +46,7 @@ namespace GRINS
std::string val_str = "Physics/"+_physics_name+"/bc_values";

this->read_bc_data( input, id_str, bc_str, var_str, val_str );

return;
}

Expand All @@ -61,12 +61,12 @@ namespace GRINS

if( bc_type == "general_viscosity" )
{
bc_type_out = GENERAL_VISCOSITY;
bc_type_out = GENERAL_VISCOSITY;
}
else
{
// Call base class to detect any physics-common boundary conditions
bc_type_out = BCHandlingBase::string_to_int( bc_type );
// Call base class to detect any physics-common boundary conditions
bc_type_out = BCHandlingBase::string_to_int( bc_type );
}

return bc_type_out;
Expand All @@ -78,49 +78,49 @@ namespace GRINS

return;
}
void SpalartAllmarasBCHandling::init_bc_types( const BoundaryID bc_id,
const std::string& bc_id_string,
const int bc_type,
const std::string& bc_vars,
const std::string& bc_value,
const GetPot& input )
{

void SpalartAllmarasBCHandling::init_bc_types( const BoundaryID bc_id,
const std::string& bc_id_string,
const int bc_type,
const std::string& bc_vars,
const std::string& bc_value,
const GetPot& input )
{
switch(bc_type)
{
case(GENERAL_VISCOSITY):
{
this->set_dirichlet_bc_type( bc_id, bc_type);
}
break;
{
this->set_dirichlet_bc_type( bc_id, bc_type);
}
break;

default:
{
// Call base class to detect any physics-common boundary conditions
BCHandlingBase::init_bc_types( bc_id, bc_id_string, bc_type,
bc_vars, bc_value, input );
}
{
// Call base class to detect any physics-common boundary conditions
BCHandlingBase::init_bc_types( bc_id, bc_id_string, bc_type,
bc_vars, bc_value, input );
}
} // End switch(bc_type)
return;
}
void SpalartAllmarasBCHandling::user_init_dirichlet_bcs( libMesh::FEMSystem* system,
libMesh::DofMap& dof_map,
BoundaryID bc_id,
BCType bc_type ) const

void SpalartAllmarasBCHandling::user_init_dirichlet_bcs( libMesh::FEMSystem* /*system*/,
libMesh::DofMap& /*dof_map*/,
BoundaryID /*bc_id*/,
BCType bc_type ) const
{
switch( bc_type )
{
case(GENERAL_VISCOSITY):
// This case is handled in the init_dirichlet_bc_func_objs
break;
case(GENERAL_VISCOSITY):
// This case is handled in the init_dirichlet_bc_func_objs
break;

default:
{
std::cerr << "Invalid BCType " << bc_type << std::endl;
libmesh_error();
}
{
std::cerr << "Invalid BCType " << bc_type << std::endl;
libmesh_error();
}

}// end switch
}

Expand Down
3 changes: 0 additions & 3 deletions src/physics/src/heat_conduction.C
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ namespace GRINS
const std::vector<std::vector<libMesh::RealGradient> >& T_gradphi =
context.get_element_fe(_temp_vars.T_var())->get_dphi();

const std::vector<libMesh::Point>& q_points =
context.get_element_fe(_temp_vars.T_var())->get_xyz();

// The subvectors and submatrices we need to fill:
//
// K_{\alpha \beta} = R_{\alpha},{\beta} = \partial{ R_{\alpha} } / \partial{ {\beta} } (where R denotes residual)
Expand Down
6 changes: 3 additions & 3 deletions test/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ check_PROGRAMS += generic_solution_regression
check_PROGRAMS += axisym_reacting_low_mach_regression
check_PROGRAMS += split_string_unit

AM_CPPFLAGS =
AM_CPPFLAGS =
AM_CPPFLAGS += -I$(top_srcdir)/src/bc_handling/include
AM_CPPFLAGS += -I$(top_srcdir)/src/boundary_conditions/include
AM_CPPFLAGS += -I$(top_srcdir)/src/common/include
Expand All @@ -58,7 +58,7 @@ AM_CPPFLAGS += $(GRVY_CFLAGS)
LIBS =
LIBS += $(LIBGRINS_LIBS)

AM_LDFLAGS =
AM_LDFLAGS =

#----------------
# Cantera support
Expand Down Expand Up @@ -281,7 +281,7 @@ if CODE_COVERAGE_ENABLED
endif

# If we have tests fail, libmesh_error() may leave output
CLEANFILES += traceout*.txt temp_print_trace.*
CLEANFILES += traceout*.txt temp_print_trace.* *.exo *.xdr

# Required for AX_AM_MACROS
###@INC_AMINCLUDE@

0 comments on commit df90f7a

Please sign in to comment.