[cig-commits] r6581 - mc/3D/CitcomS/branches/compressible/lib
tan2 at geodynamics.org
tan2 at geodynamics.org
Mon Apr 16 15:35:40 PDT 2007
Author: tan2
Date: 2007-04-16 15:35:39 -0700 (Mon, 16 Apr 2007)
New Revision: 6581
Modified:
mc/3D/CitcomS/branches/compressible/lib/Instructions.c
mc/3D/CitcomS/branches/compressible/lib/global_defs.h
Log:
Removed some unused variables in global_defs.h
Modified: mc/3D/CitcomS/branches/compressible/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Instructions.c 2007-04-16 22:34:53 UTC (rev 6580)
+++ mc/3D/CitcomS/branches/compressible/lib/Instructions.c 2007-04-16 22:35:39 UTC (rev 6581)
@@ -220,7 +220,6 @@
else if ( strcmp(E->control.PROBLEM_TYPE,"convection-chemical") == 0) {
E->control.CONVECTION = 1;
- E->control.CHEMISTRY_MODULE=1;
set_convection_defaults(E);
}
@@ -702,12 +701,8 @@
E->control.v_steps_low = 10;
E->control.v_steps_upper = 1;
- E->control.max_res_red_each_p_mg = 1.0e-3;
E->control.accuracy = 1.0e-6;
E->control.vaccuracy = 1.0e-8;
- E->control.true_vcycle=0;
- E->control.depth_dominated=0;
- E->control.eqn_zigzag=0;
E->control.verbose=0; /* debugging/profiles */
/* SECOND: values for which an obvious default setting is useful */
@@ -716,11 +711,9 @@
E->control.ORTHOZ = 1; /* for orthogonal meshes by default */
- E->control.KERNEL = 0;
E->control.stokes=0;
E->control.restart=0;
E->control.CONVECTION = 0;
- E->control.SLAB = 0;
E->control.CART2D = 0;
E->control.CART3D = 0;
E->control.CART2pt5D = 0;
@@ -732,10 +725,6 @@
E->control.augmented_Lagr = 0;
E->control.augmented = 0.0;
- /* Default: all optional modules set to `off' */
- E->control.MELTING_MODULE = 0;
- E->control.CHEMISTRY_MODULE = 0;
-
E->control.GRID_TYPE=1;
E->parallel.nprocx=1; E->parallel.nprocz=1; E->parallel.nprocy=1;
@@ -752,7 +741,6 @@
E->sphere.ri = 0.5;
E->control.precondition = 0; /* for larger visc contrasts turn this back on */
- E->control.vprecondition = 1;
E->mesh.toptbc = 1; /* fixed t */
E->mesh.bottbc = 1;
Modified: mc/3D/CitcomS/branches/compressible/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/global_defs.h 2007-04-16 22:34:53 UTC (rev 6580)
+++ mc/3D/CitcomS/branches/compressible/lib/global_defs.h 2007-04-16 22:35:39 UTC (rev 6581)
@@ -268,7 +268,7 @@
double *angle1[MAX_LEVELS][NCS][5];
double dircos[4][4];
- double *R[MAX_LEVELS],*R_redundant;
+ double *R[MAX_LEVELS];
double ro,ri;
struct CAP cap[NCS];
@@ -383,8 +383,6 @@
char output_written_external_command[500]; /* a unix command to run when output files have been created */
int ORTHO,ORTHOZ; /* indicates levels of mesh symmetry */
- char B_is_good[MAX_LEVELS]; /* general information controlling program flow */
- char Ahat_is_good[MAX_LEVELS]; /* general information controlling program flow */
char data_prefix[50];
char data_prefix_old[50];
@@ -395,22 +393,12 @@
char data_file[200];
char old_P_file[200];
- char post_topo_file[100];
- char slabgeoid_file[100];
-
- char which_data_files[1000];
- char which_horiz_averages[1000];
- char which_running_data[1000];
- char which_observable_data[1000];
-
char PROBLEM_TYPE[20]; /* one of ... */
- int KERNEL;
int CONVECTION;
int stokes;
int restart;
int post_p;
int post_topo;
- int SLAB;
int compressible;
char GEOMETRY[20]; /* one of ... */
@@ -432,10 +420,6 @@
int AVS;
int CONMAN;
- int read_density;
- int read_slab;
- int read_slabgeoid;
-
int pseudo_free_surf;
int tracer;
@@ -490,26 +474,16 @@
float TBCbotval;
float Q0;
- float jrelax;
int precondition;
- int vprecondition;
int keep_going;
int v_steps_low;
int v_steps_high;
int v_steps_upper;
- int max_vel_iterations;
int p_iterations;
- int max_same_visc;
- float max_res_red_each_p_mg;
- float sub_stepping_factor;
int mg_cycle;
- int true_vcycle;
int down_heavy;
int up_heavy;
- int depth_dominated;
- int eqn_viscosity;
- int eqn_zigzag;
int verbose;
int side_sbcs;
@@ -530,13 +504,6 @@
int print_convergence;
int sdepv_print_convergence;
- /* modules */
- int MELTING_MODULE;
- int CHEMISTRY_MODULE;
-
- /* for embedded setting */
- int embedded;
-
};
@@ -684,8 +651,6 @@
struct SIEN *sien[NCS];
struct ID *id[NCS];
struct COORD *ECO[MAX_LEVELS][NCS];
- struct IEN *IEN_redundant[NCS];
- struct ID *ID_redundant[NCS];
struct IEN *IEN[MAX_LEVELS][NCS]; /* global at each level */
struct FNODE *TWW[MAX_LEVELS][NCS]; /* for nodal averages */
struct ID *ID[MAX_LEVELS][NCS];
@@ -719,14 +684,12 @@
double *T[NCS],*Tdot[NCS],*buoyancy[NCS];
double *u1[NCS];
double *temp[NCS],*temp1[NCS];
- float *NP[NCS],*edot[NCS],*Mass[NCS],*tw[NCS];
+ float *NP[NCS],*edot[NCS],*Mass[NCS];
float *MASS[MAX_LEVELS][NCS];
- double *ZZ;
double *SX[MAX_LEVELS][NCS][4],*X[MAX_LEVELS][NCS][4];
double *sx[NCS][4],*x[NCS][4];
double *surf_det[NCS][5];
double *SinCos[MAX_LEVELS][NCS][4];
- float *TT;
float *V[NCS][4],*GV[NCS][4],*GV1[NCS][4];
float *stress[NCS];
@@ -736,7 +699,6 @@
float *Vi[NCS],*EVi[NCS];
float *VI[MAX_LEVELS][NCS],*EVI[MAX_LEVELS][NCS];
- float *TW[MAX_LEVELS][NCS]; /* nodal weightings */
int num_zero_resid[MAX_LEVELS][NCS];
int *zero_resid[MAX_LEVELS][NCS];
More information about the cig-commits
mailing list