User: knarf Date: 2013/11/26 11:18 AM
Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ ParamCheck.c
Log: remove support for conformal metrics, since ADMMacros now doens't use this as well anymore
File Changes:
Directory: /trunk/src/ ======================
File [modified]: ParamCheck.c Delta lines: +2 -45 =================================================================== --- trunk/src/ParamCheck.c 2013-11-25 15:38:20 UTC (rev 159) +++ trunk/src/ParamCheck.c 2013-11-26 17:18:25 UTC (rev 160) @@ -63,53 +63,10 @@ DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS;
- if(! CCTK_EQUALS(metric_type, "physical") && - ! CCTK_EQUALS(metric_type, "static conformal")) + if(! CCTK_EQUALS(metric_type, "physical")) { - CCTK_PARAMWARN("Unknown ADMBase::metric_type - known types are "physical" and "static conformal""); + CCTK_PARAMWARN("Unknown ADMBase::metric_type - known type is "physical""); }
- if(CCTK_EQUALS(metric_type, "static conformal") && - ! CCTK_EQUALS(conformal_storage, "factor+derivs+2nd derivs")) - { - CCTK_PARAMWARN("ADMConstraints can currently only work with a physical metric or a static conformal metric with second derivatives"); - } - }
- /*@@ - @routine ADMConstraints_ConformalCheck - @date Fri Apr 26 11:40:36 2002 - @author Tom Goodale - @desc - Check that the initial data has setup enough derivatives. - @enddesc - @calls - @calledby - @history - - @endhistory - - @@*/ -void ADMConstraints_ConformalCheck(CCTK_ARGUMENTS) -{ - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - - if(CCTK_EQUALS(metric_type, "physical")) - { - /* Use this internally so we don't need to check the parameter again. */ - *conformal_state = 0; - } - else if(CCTK_EQUALS(metric_type, "static conformal")) - { - if(*conformal_state < 3) - { - CCTK_WARN(0, "ADMConstraints needs second derivatives of the conformal factor when running with a static conformal metric"); - } - } - -} -/******************************************************************** - ********************* Local Routines ************************* - ********************************************************************/
Directory: /trunk/ ==================
File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2013-11-25 15:38:20 UTC (rev 159) +++ trunk/interface.ccl 2013-11-26 17:18:25 UTC (rev 160) @@ -2,7 +2,7 @@ # $Header$
implements: admconstraints -inherits: ADMBase, StaticConformal, SpaceMask, grid, ADMMacros, TmunuBase +inherits: ADMBase, SpaceMask, grid, ADMMacros, TmunuBase friend: ADMCoupling
USES INCLUDE: CalcTmunu.inc
File [modified]: schedule.ccl Delta lines: +1 -6 =================================================================== --- trunk/schedule.ccl 2013-11-25 15:38:20 UTC (rev 159) +++ trunk/schedule.ccl 2013-11-26 17:18:25 UTC (rev 160) @@ -5,13 +5,8 @@ { LANG: C OPTIONS: global -} "Check that we can deal with this metric_type and have enough conformal derivatives" +} "Check that we can deal with this metric_type"
-schedule ADMConstraints_ConformalCheck at CCTK_POSTINITIAL -{ - LANG: C -} "Set conformal_state to 0 for physical, or check that it is at least 3" - schedule ADMConstraint_InitSymBound at CCTK_WRAGH { LANG: Fortran