[cig-commits] r5343 - mc/3D/CitcomS/trunk/lib
tan2 at geodynamics.org
tan2 at geodynamics.org
Wed Nov 22 12:05:23 PST 2006
Author: tan2
Date: 2006-11-22 12:05:23 -0800 (Wed, 22 Nov 2006)
New Revision: 5343
Removed:
mc/3D/CitcomS/trunk/lib/temperature_descriptions.h
Modified:
mc/3D/CitcomS/trunk/lib/Full_parallel_related.c
mc/3D/CitcomS/trunk/lib/Full_version_dependent.c
mc/3D/CitcomS/trunk/lib/Makefile.am
mc/3D/CitcomS/trunk/lib/Regional_parallel_related.c
mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c
mc/3D/CitcomS/trunk/lib/global_defs.h
Log:
Removed unused codes and files
Modified: mc/3D/CitcomS/trunk/lib/Full_parallel_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_parallel_related.c 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/Full_parallel_related.c 2006-11-22 20:05:23 UTC (rev 5343)
@@ -273,38 +273,6 @@
E->lmesh.nsf = E->lmesh.nno/E->lmesh.noz;
E->lmesh.snel = E->lmesh.elx*E->lmesh.ely;
-
-
-
-#if 0
- i = cases[E->sphere.caps_per_proc];
-
- E->parallel.nproc_sph[1] = incases3[i].xy[0];
- E->parallel.nproc_sph[2] = incases3[i].xy[1];
-
- E->sphere.lelx = E->sphere.elx/E->parallel.nproc_sph[1];
- E->sphere.lely = E->sphere.ely/E->parallel.nproc_sph[2];
- E->sphere.lsnel = E->sphere.lely*E->sphere.lelx;
- E->sphere.lnox = E->sphere.lelx + 1;
- E->sphere.lnoy = E->sphere.lely + 1;
- E->sphere.lnsf = E->sphere.lnox*E->sphere.lnoy;
-
-/* NOTE: These are for spherical harmonics - they may not be correct! CPC */
- for (i=0;i<=E->parallel.nprocz-1;i++)
- if (E->parallel.me_loc[3] == i) {
- E->parallel.me_sph = (E->parallel.me-i)/E->parallel.nprocz;
- E->parallel.me_loc_sph[1] = E->parallel.me_sph%E->parallel.nproc_sph[1];
- E->parallel.me_loc_sph[2] = E->parallel.me_sph/E->parallel.nproc_sph[1];
- }
-
- E->sphere.lexs = E->sphere.lelx * E->parallel.me_loc_sph[1];
- E->sphere.leys = E->sphere.lely * E->parallel.me_loc_sph[2];
-
-#endif
-
-
-
-
for(i=E->mesh.levmax;i>=E->mesh.levmin;i--) {
if (E->control.NMULTIGRID||E->control.EMULTIGRID) {
Modified: mc/3D/CitcomS/trunk/lib/Full_version_dependent.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Full_version_dependent.c 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/Full_version_dependent.c 2006-11-22 20:05:23 UTC (rev 5343)
@@ -111,15 +111,7 @@
}
-#if 0
- E->sphere.elx = E->sphere.nox-1;
- E->sphere.ely = E->sphere.noy-1;
- E->sphere.snel = E->sphere.ely*E->sphere.elx;
- E->sphere.nsf = E->sphere.noy*E->sphere.nox;
-#endif
-
-
/* Myr */
E->data.scalet = (E->data.radius_km*1e3*E->data.radius_km*1e3/E->data.therm_diff)/(1.e6*365.25*24*3600);
/* cm/yr */
Modified: mc/3D/CitcomS/trunk/lib/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/lib/Makefile.am 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/Makefile.am 2006-11-22 20:05:23 UTC (rev 5343)
@@ -103,7 +103,6 @@
Sphere_harmonics.c \
Sphere_util.c \
Stokes_flow_Incomp.c \
- temperature_descriptions.h \
Topo_gravity.c \
Tracer_advection.c \
tracer_defs.h \
Modified: mc/3D/CitcomS/trunk/lib/Regional_parallel_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_parallel_related.c 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/Regional_parallel_related.c 2006-11-22 20:05:23 UTC (rev 5343)
@@ -239,34 +239,6 @@
E->lmesh.snel = E->lmesh.elx*E->lmesh.ely;
-
-
-#if 0
- i = cases[E->sphere.caps_per_proc];
-
- E->parallel.nproc_sph[1] = incases3[i].xy[0];
- E->parallel.nproc_sph[2] = incases3[i].xy[1];
-
- E->sphere.lelx = E->sphere.elx/E->parallel.nproc_sph[1];
- E->sphere.lely = E->sphere.ely/E->parallel.nproc_sph[2];
- E->sphere.lsnel = E->sphere.lely*E->sphere.lelx;
- E->sphere.lnox = E->sphere.lelx + 1;
- E->sphere.lnoy = E->sphere.lely + 1;
- E->sphere.lnsf = E->sphere.lnox*E->sphere.lnoy;
-
- for (i=0;i<=E->parallel.nprocz-1;i++)
- if (E->parallel.me_loc[3] == i) {
- E->parallel.me_sph = (E->parallel.me-i)/E->parallel.nprocz;
- E->parallel.me_loc_sph[1] = E->parallel.me_sph%E->parallel.nproc_sph[1];
- E->parallel.me_loc_sph[2] = E->parallel.me_sph/E->parallel.nproc_sph[1];
- }
-
- E->sphere.lexs = E->sphere.lelx * E->parallel.me_loc_sph[1];
- E->sphere.leys = E->sphere.lely * E->parallel.me_loc_sph[2];
-#endif
-
-
-
for(i=E->mesh.levmax;i>=E->mesh.levmin;i--) {
if (E->control.NMULTIGRID||E->control.EMULTIGRID) {
Modified: mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/Regional_version_dependent.c 2006-11-22 20:05:23 UTC (rev 5343)
@@ -114,14 +114,6 @@
}
-#if 0
- E->sphere.elx = E->sphere.nox-1;
- E->sphere.ely = E->sphere.noy-1;
- E->sphere.snel = E->sphere.ely*E->sphere.elx;
- E->sphere.nsf = E->sphere.noy*E->sphere.nox;
-#endif
-
-
/* Scaling from dimensionless units to Millions of years for input velocity
and time, timdir is the direction of time for advection. CPC 6/25/00 */
Modified: mc/3D/CitcomS/trunk/lib/global_defs.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/global_defs.h 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/global_defs.h 2006-11-22 20:05:23 UTC (rev 5343)
@@ -95,10 +95,7 @@
#endif
#define MAX_LEVELS 12 /* max. number of multigrid levels */
-#define MAX_F 10
-#define MAX_S 30
#define NCS 14 /* max. number of sphere caps */
-#define MAXP 20 /* max. number of plates */
typedef float higher_precision; /* matrix coeffs etc */
typedef double higher_precision1; /* intermediate calculations for finding above coeffs */
@@ -121,115 +118,6 @@
};
-struct Rect {
- int numb;
- char overlay[40];
- float x1[40];
- float x2[40];
- float z1[40];
- float z2[40];
- float y1[40];
- float y2[40];
- float halfw[40];
- float mag[40];
-};
-
-
-struct Circ {
- int numb;
- char overlay[40];
- float x[40];
- float z[40];
- float y[40];
- float rad[40];
- float mag[40];
- float halfw[40];
-};
-
-
-struct Harm {
- int numb;
- int harms;
- char overlay[40];
- float off[40];
- float x1[40];
- float x2[40];
- float z1[40];
- float z2[40];
- float y1[40];
- float y2[40];
- float kx[20][40];
- float kz[20][40];
- float ky[20][40];
- float ka[20][40];
- float phx[20][40];
- float phz[20][40];
- float phy[20][40];
-};
-
-struct Erfc {
- int numb;
-
-
-};
-
-struct RectBc {
- int numb;
- char norm[40];
- float intercept[40];
- float x1[40];
- float x2[40];
- float z1[40];
- float z2[40];
- float halfw[40];
- float mag[40];
-};
-
-
-struct CircBc {
- int numb;
- char norm[40];
- float intercept[40];
- float x[40];
- float z[40];
- float rad[40];
- float mag[40];
- float halfw[40];
-};
-
-
-struct PolyBc {
- int numb;
- int order;
- char norm[40];
- float intercept[40];
- float x1[40];
- float x2[40];
- float z1[40];
- float z2[40];
- float ax[20][40];
- float az[20][40];
-};
-
-
-struct HarmBc {
- int numb;
- int harms;
- char norm[40];
- float off[40];
- float intercept[40];
- float x1[40];
- float x2[40];
- float z1[40];
- float z2[40];
- float kx[20][40];
- float kz[20][40];
- float ka[20][40];
- float phx[20][40];
- float phz[20][40];
-};
-
-
struct Shape_function_dA {
double vpt[8+1];
double ppt[1+1]; };
@@ -269,20 +157,9 @@
struct EG {
higher_precision g[24][1]; };
-struct EK2 {
- double k[8*8]; };
-
struct EK {
double k[24*24]; };
-struct MEK {
- double nint[9]; };
-
-struct NK {
- higher_precision *k;
- int *map;
-};
-
struct COORD {
float centre[4];
float size[4];
@@ -293,14 +170,15 @@
struct ID {
int doff[4]; }; /* can be 1 or 2 or 3 */
+
struct IEN {
int node[9]; };
+
struct FNODE {
float node[9]; };
+
struct SIEN {
int node[5]; };
-struct LM {
- struct { int doff[4]; } node[9]; } ;
struct BOUND {
int bound[8]; };
@@ -326,13 +204,6 @@
int ****loc2proc_map;
-#if 0
- int nproc_sph[3];
- int me_sph;
- int me_loc_sph[3];
-#endif
-
-
int redundant[MAX_LEVELS];
int idb;
int me_loc[4];
@@ -391,43 +262,6 @@
double **tablescosf[NCS];
double **tablessinf[NCS];
- /**/
-#if 0
- int nox;
- int noy;
- int noz;
- int nsf;
- int nno;
- int elx;
- int ely;
- int elz;
- int snel;
- int llmax;
-
- int *int_cap;
- int *int_ele;
- float *harm_slab[2];
- float *harm_velp[2];
- float *harm_velt[2];
- float *harm_divg[2];
- float *harm_vort[2];
- float *harm_visc[2];
- double *sx[4];
- double *det[5];
- double *con;
-
- double *tableplm[181];
- double *tablecosf[361];
- double *tablesinf[361];
- double tablesint[181];
-
- double *tableplm_n[182];
- double *tablecosf_n[362];
- double *tablesinf_n[362];
- /**/
- struct SIEN *sien;
-#endif
-
double area[NCS];
double angle[NCS][5];
double *area1[MAX_LEVELS][NCS];
@@ -438,21 +272,6 @@
double ro,ri;
struct CAP cap[NCS];
- float *radius;
- int slab_layers;
-
-
- int lnox;
- int lnoy;
- int lnoz;
- int lnsf;
- int lnno;
- int lelx;
- int lely;
- int lelz;
- int lsnel;
- int lexs;
- int leys;
};
@@ -563,12 +382,7 @@
float *freesurf[NCS];
};
-struct BAVE {
- float T;
- float Vi;
- double V[4]; };
-
struct MONITOR {
char node_output[100][6]; /* recording the format of the output data */
char sobs_output[100][6]; /* recording the format of the output data */
@@ -847,7 +661,6 @@
#include "solver.h"
#include "convection_variables.h"
#include "viscosity_descriptions.h"
- /*#include "temperature_descriptions.h"*/
#include "advection.h"
#include "tracer_defs.h"
@@ -859,7 +672,6 @@
struct HDF5_INFO hdf5;
#endif
struct HAVE Have;
- struct BAVE Bulkave;
struct MESH_DATA mesh;
struct MESH_DATA lmesh;
struct CONTROL control;
@@ -938,9 +750,6 @@
float *age[NCS]; /* nodal weightings */
float *age_t;
- struct LM *lm[NCS];
- struct LM *LMD[MAX_LEVELS][NCS];
-
struct Shape_function1 M; /* master-element shape funtions */
struct Shape_function1_dx Mx;
struct Shape_function N;
Deleted: mc/3D/CitcomS/trunk/lib/temperature_descriptions.h
===================================================================
--- mc/3D/CitcomS/trunk/lib/temperature_descriptions.h 2006-11-22 19:41:43 UTC (rev 5342)
+++ mc/3D/CitcomS/trunk/lib/temperature_descriptions.h 2006-11-22 20:05:23 UTC (rev 5343)
@@ -1,39 +0,0 @@
-/*
- *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *<LicenseText>
- *
- * CitcomS by Louis Moresi, Shijie Zhong, Lijie Han, Eh Tan,
- * Clint Conrad, Michael Gurnis, and Eun-seo Choi.
- * Copyright (C) 1994-2005, California Institute of Technology.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- *</LicenseText>
- *
- *~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-struct TEMP_OPT {
- void (* update_temperature)();
-
- struct Rect Trects;
- struct Circ Tcircs;
- struct Harm Tharms;
- struct RectBc Trectbcs;
- struct CircBc Tcircbcs;
-
-
-} temperature;
-
More information about the cig-commits
mailing list