diff options
author | goodale <goodale@b61c5cb5-eaca-4651-9a7a-d64986f99364> | 2000-02-17 17:38:50 +0000 |
---|---|---|
committer | goodale <goodale@b61c5cb5-eaca-4651-9a7a-d64986f99364> | 2000-02-17 17:38:50 +0000 |
commit | c06576a3bcd5cace72592c6041e6fb2827ffbff6 (patch) | |
tree | 5565cc938c0841bcf8372b15496b72b6b98b221f /src/SetupGroup.c | |
parent | 539cd2636da010382f41c9ff1ba237ec080e5341 (diff) |
Untabified.
Got rid of redundant file.
Did some formatting changes in line with the coding guidelines.
Tom
git-svn-id: http://svn.cactuscode.org/arrangements/CactusPUGH/PUGH/trunk@164 b61c5cb5-eaca-4651-9a7a-d64986f99364
Diffstat (limited to 'src/SetupGroup.c')
-rw-r--r-- | src/SetupGroup.c | 181 |
1 files changed, 83 insertions, 98 deletions
diff --git a/src/SetupGroup.c b/src/SetupGroup.c index 072a2da..ec9620d 100644 --- a/src/SetupGroup.c +++ b/src/SetupGroup.c @@ -5,6 +5,7 @@ @desc Subroutines for setting up a group on a pGH. @enddesc + @version $Header$ @@*/ #include <stdio.h> @@ -55,7 +56,7 @@ pGA *SetupPGA int varsize, int vtype, int stagger - ); + ); /*@@ @@ -97,21 +98,21 @@ int pugh_SetupScalarGroup for(variable = 0; variable < n_variables; variable++) { newGH->variables[newGH->nvariables] = - (void **)malloc(n_timelevels*sizeof(void *)); + (void **)malloc(n_timelevels*sizeof(void *)); if(newGH->variables[newGH->nvariables]) { - for(level = 0; level < n_timelevels; level++) - { - newGH->variables[newGH->nvariables][level] = (void *)malloc(var_size); - } - newGH->nvariables++; + for(level = 0; level < n_timelevels; level++) + { + newGH->variables[newGH->nvariables][level] = (void *)malloc(var_size); + } + newGH->nvariables++; } else { - CCTK_WARN(1,"Memory error in SetupScalarGroup"); - retval = PUGH_ERRORMEMORY; - break; + CCTK_WARN(1,"Memory error in SetupScalarGroup"); + retval = PUGH_ERRORMEMORY; + break; } } } @@ -175,17 +176,14 @@ int pugh_SetupArrayGroup connectivity = pugh_SetupConnectivity(dim,newGH->nprocs,nprocs,periodic); - extras = pugh_SetupPGExtras - ( - dim, - periodic, - staggercode, - nsize, - ghostsize, - newGH->nprocs, - connectivity->nprocs, - newGH->myproc - ); + extras = pugh_SetupPGExtras(dim, + periodic, + staggercode, + nsize, + ghostsize, + newGH->nprocs, + connectivity->nprocs, + newGH->myproc); free(nprocs); /* free(nghostzones);*/ @@ -200,31 +198,28 @@ int pugh_SetupArrayGroup for(variable = 0; variable < n_variables; variable++) { newGH->variables[newGH->nvariables] = - (void **)malloc(n_timelevels*sizeof(void *)); + (void **)malloc(n_timelevels*sizeof(void *)); if(newGH->variables[newGH->nvariables]) { - for(level = 0; level < n_timelevels; level++) - { - newGH->variables[newGH->nvariables][level] = SetupPGA - ( - newGH, - extras, - connectivity, - CCTK_VarName(newGH->nvariables), - newGH->nvariables, - var_size, - vtype, - staggercode - ); - } - newGH->nvariables++; + for(level = 0; level < n_timelevels; level++) + { + newGH->variables[newGH->nvariables][level] = SetupPGA(newGH, + extras, + connectivity, + CCTK_VarName(newGH->nvariables), + newGH->nvariables, + var_size, + vtype, + staggercode); + } + newGH->nvariables++; } else { - CCTK_WARN(1,"Memory error in SetupArrayGroup"); - retval = PUGH_ERRORMEMORY; - break; + CCTK_WARN(1,"Memory error in SetupArrayGroup"); + retval = PUGH_ERRORMEMORY; + break; } } } @@ -253,11 +248,11 @@ int pugh_SetupArrayGroup @@*/ int pugh_SetupGFGroup(pGH *newGH, - int vtype, - int dim, - int n_variables, - int staggercode, - int n_timelevels) + int vtype, + int dim, + int n_variables, + int staggercode, + int n_timelevels) { int variable; @@ -268,7 +263,7 @@ int pugh_SetupGFGroup(pGH *newGH, void ***temp; temp = (void ***)realloc(newGH->variables, - (newGH->nvariables+n_variables)*sizeof(void **)); + (newGH->nvariables+n_variables)*sizeof(void **)); if(temp) { @@ -277,36 +272,36 @@ int pugh_SetupGFGroup(pGH *newGH, for(variable = 0; variable < n_variables; variable++) { newGH->variables[newGH->nvariables] = - (void **)malloc(n_timelevels*sizeof(void *)); + (void **)malloc(n_timelevels*sizeof(void *)); if(newGH->variables[newGH->nvariables]) { - for(level = 0; level < n_timelevels; level++) - { - newGH->variables[newGH->nvariables][level] = - SetupPGF(newGH, - CCTK_VarName(newGH->nvariables), - dim, - var_size, - vtype, - staggercode); - /* newGH->variables[newGH->nvariables][level] = - SetupPGA(newGH, - newGH->GFExtras[dim-1], - newGH->Connectivity[dim-1], - CCTK_VarName(newGH->nvariables), - newGH->nvariables, - var_size, - vtype, - staggercode);*/ - } - newGH->nvariables++; + for(level = 0; level < n_timelevels; level++) + { + newGH->variables[newGH->nvariables][level] = + SetupPGF(newGH, + CCTK_VarName(newGH->nvariables), + dim, + var_size, + vtype, + staggercode); + /* newGH->variables[newGH->nvariables][level] = + SetupPGA(newGH, + newGH->GFExtras[dim-1], + newGH->Connectivity[dim-1], + CCTK_VarName(newGH->nvariables), + newGH->nvariables, + var_size, + vtype, + staggercode);*/ + } + newGH->nvariables++; } else { - CCTK_WARN(1,"Memory error in SetupGFGroup"); - retval = PUGH_ERRORMEMORY; - break; + CCTK_WARN(1,"Memory error in SetupGFGroup"); + retval = PUGH_ERRORMEMORY; + break; } } } @@ -355,37 +350,28 @@ int PUGH_SetupGroup switch(gtype) { case CCTK_SCALAR : - returncode = pugh_SetupScalarGroup - ( - newGH, - vtype, - n_variables, - n_timelevels - ); + returncode = pugh_SetupScalarGroup(newGH, + vtype, + n_variables, + n_timelevels); break; case CCTK_ARRAY : - returncode = pugh_SetupArrayGroup - ( - newGH, - nsize, - nghostsize, - vtype, - dim, - n_variables, - staggercode, - n_timelevels - ); + returncode = pugh_SetupArrayGroup(newGH, + nsize, + nghostsize, + vtype, + dim, + n_variables, + staggercode, + n_timelevels); break; case CCTK_GF : - returncode = pugh_SetupGFGroup - ( - newGH, - vtype, - dim, - n_variables, - staggercode, - n_timelevels - ); + returncode = pugh_SetupGFGroup(newGH, + vtype, + dim, + n_variables, + staggercode, + n_timelevels); break; default : CCTK_WARN(0, "Unknown group type in pugh_SetupGroup"); @@ -395,4 +381,3 @@ int PUGH_SetupGroup return returncode; } - |