diff options
| author | eschnett <eschnett@5633253d-7678-4964-a54d-f87795f8ee59> | 2013-01-15 19:42:30 +0000 |
|---|---|---|
| committer | eschnett <eschnett@5633253d-7678-4964-a54d-f87795f8ee59> | 2013-01-15 19:42:30 +0000 |
| commit | 92c67a74dc988b1eb15eaaee8b3e358af47755e2 (patch) | |
| tree | a1d770f3707c19ee01b0c34f48192f8c19ceb5ee | |
| parent | 58583899d5af0088db955ad2851edd582bc6f86b (diff) | |
git-svn-id: http://svn.cactuscode.org/arrangements/CactusBase/Time/trunk@91 5633253d-7678-4964-a54d-f87795f8ee59
| -rw-r--r-- | src/Courant.c | 21 | ||||
| -rw-r--r-- | src/Given.c | 18 | ||||
| -rw-r--r-- | src/Initialise.c | 9 | ||||
| -rw-r--r-- | src/Simple.c | 17 |
4 files changed, 19 insertions, 46 deletions
diff --git a/src/Courant.c b/src/Courant.c index 577a2a6..2b2fc1d 100644 --- a/src/Courant.c +++ b/src/Courant.c @@ -5,31 +5,24 @@ @desc Specification of timestep using Courant condition @enddesc - @version $Id$ @@*/ -#include <stdlib.h> #include <math.h> +#include <stdlib.h> -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Parameters.h" - -static const char *rcsid = "$Header$"; - -CCTK_FILEVERSION(CactusBase_Time_Courant_c) +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> -void Time_Courant(CCTK_ARGUMENTS); void Time_Courant(CCTK_ARGUMENTS) { - CCTK_REAL min_spacing; - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS; + DECLARE_CCTK_ARGUMENTS; /* Calculate the minimum grid spacing */ - min_spacing = cctk_delta_space[0]; + CCTK_REAL min_spacing = cctk_delta_space[0]; if (cctk_dim>=2) { diff --git a/src/Given.c b/src/Given.c index 3e11976..19fb9be 100644 --- a/src/Given.c +++ b/src/Given.c @@ -9,23 +9,15 @@ #include <stdlib.h> -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Parameters.h" +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> -static const char *rcsid = "$Header$"; - -CCTK_FILEVERSION(CactusBase_Time_Given_c) - -void Time_Given(CCTK_ARGUMENTS); void Time_Given(CCTK_ARGUMENTS) { - DECLARE_CCTK_PARAMETERS - DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS; + DECLARE_CCTK_ARGUMENTS; cctkGH->cctk_delta_time = timestep; } - - - diff --git a/src/Initialise.c b/src/Initialise.c index 6b7367c..7582ba9 100644 --- a/src/Initialise.c +++ b/src/Initialise.c @@ -7,14 +7,9 @@ @enddesc @@*/ -#include "cctk.h" -#include "cctk_Arguments.h" +#include <cctk.h> +#include <cctk_Arguments.h> -static const char *rcsid = "$Header$"; - -CCTK_FILEVERSION(CactusBase_Time_Initialise_c) - -void Time_Initialise(CCTK_ARGUMENTS); void Time_Initialise(CCTK_ARGUMENTS) { diff --git a/src/Simple.c b/src/Simple.c index 15ac2cf..8ecd7b7 100644 --- a/src/Simple.c +++ b/src/Simple.c @@ -9,27 +9,20 @@ #include <stdlib.h> -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Parameters.h" +#include <cctk.h> +#include <cctk_Arguments.h> +#include <cctk_Parameters.h> -static const char *rcsid = "$Header$"; - -CCTK_FILEVERSION(CactusBase_Time_Simple_c) - -void Time_Simple(CCTK_ARGUMENTS); void Time_Simple(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - CCTK_REAL min_spacing; - int d; /* Calculate the minimum grid spacing */ - min_spacing = cctk_delta_space[0]; - for (d=1; d<cctk_dim; ++d) + CCTK_REAL min_spacing = cctk_delta_space[0]; + for (int d=1; d<cctk_dim; ++d) { min_spacing = (min_spacing<cctk_delta_space[d] ? min_spacing : cctk_delta_space[d]); |