Revision 0461d2e117ce88704a56dd8bcbf6bf7787991b15 authored by Eh Tan on 08 November 2007, 23:28:46 UTC, committed by Eh Tan on 08 November 2007, 23:28:46 UTC
svn+ssh://svn@geodynamics.org/cig/mc/3D/CitcomS/trunk ........ r8194 | tan2 | 2007-10-30 14:49:58 -0700 (Tue, 30 Oct 2007) | 1 line Compute d(rho)/dr/rho from rho(r) ........ r8195 | tan2 | 2007-10-30 14:50:52 -0700 (Tue, 30 Oct 2007) | 1 line Fixed a bug in dimensionalizing density. Provided the formula of geoid calculation in the comments. Rearranged the order of functions. ........ r8196 | tan2 | 2007-10-30 14:53:50 -0700 (Tue, 30 Oct 2007) | 1 line A post-processing program to project geoid coefficents onto a regular (longitude, latitude) mesh ........ r8197 | tan2 | 2007-10-30 14:54:14 -0700 (Tue, 30 Oct 2007) | 1 line Added the C program project_geoid to the makefile ........ r8199 | tan2 | 2007-10-30 15:29:44 -0700 (Tue, 30 Oct 2007) | 1 line Minor modification ........ r8201 | tan2 | 2007-11-01 16:33:30 -0700 (Thu, 01 Nov 2007) | 1 line Print dv/v=dp/p=1.0 for the 1st Uzawa iteraion ........ r8202 | tan2 | 2007-11-01 16:33:50 -0700 (Thu, 01 Nov 2007) | 1 line Fixed an error in comment ........ r8204 | tan2 | 2007-11-05 17:03:35 -0800 (Mon, 05 Nov 2007) | 1 line Scaled topo with variable gravity. Fixed an error in comment. Rearranged computation. ........ r8205 | tan2 | 2007-11-05 17:03:55 -0800 (Mon, 05 Nov 2007) | 1 line Removed functions related sph. harm in lib/Regional_obsolete.c ........ r8206 | tan2 | 2007-11-05 17:04:20 -0800 (Mon, 05 Nov 2007) | 1 line Shrank the size of sph. harm arrays ........ r8207 | tan2 | 2007-11-05 17:04:43 -0800 (Mon, 05 Nov 2007) | 1 line Init'd some variables about vtk_io, which might be accessed with uninit'd values in output_finalize() ........ r8212 | tan2 | 2007-11-06 15:17:54 -0800 (Tue, 06 Nov 2007) | 1 line Fixed a few memory errors ........ r8213 | tan2 | 2007-11-06 15:18:12 -0800 (Tue, 06 Nov 2007) | 1 line Increase vlowstep to match the default value in pyre ........ r8214 | tan2 | 2007-11-06 15:18:35 -0800 (Tue, 06 Nov 2007) | 1 line Removed unused multigrid parameters ........ r8215 | tan2 | 2007-11-06 15:18:54 -0800 (Tue, 06 Nov 2007) | 1 line Added cgrad solver convergence parameters, increased buoyancy_ratio and lower the # of steps ........ r8226 | tan2 | 2007-11-07 11:51:56 -0800 (Wed, 07 Nov 2007) | 1 line Print a warning when matrix eqn solver not converging ........ r8227 | tan2 | 2007-11-07 11:52:17 -0800 (Wed, 07 Nov 2007) | 1 line Removed comp_el from default output, since it is not required for restart anymore. ........ r8228 | tan2 | 2007-11-07 11:52:39 -0800 (Wed, 07 Nov 2007) | 1 line Decreased the # of processors. This is the only way I can reproduce single-cell convection as in the manual. ........ r8235 | tan2 | 2007-11-08 11:18:26 -0800 (Thu, 08 Nov 2007) | 1 line Dereased the timestep size to reduce artifacts in advection ........ r8236 | tan2 | 2007-11-08 11:18:52 -0800 (Thu, 08 Nov 2007) | 1 line Update NEWS ........ r8237 | tan2 | 2007-11-08 11:19:12 -0800 (Thu, 08 Nov 2007) | 1 line Update the version number ........ r8241 | tan2 | 2007-11-08 13:17:14 -0800 (Thu, 08 Nov 2007) | 1 line Updated file ChangeLog to r8240 ........ r8242 | tan2 | 2007-11-08 13:36:55 -0800 (Thu, 08 Nov 2007) | 1 line Removed binary checkpoint files from makefile, as the file size is too big for distribution. ........ r8243 | tan2 | 2007-11-08 13:38:09 -0800 (Thu, 08 Nov 2007) | 1 line Updated file ChangeLog to r8242 ........ r8244 | tan2 | 2007-11-08 14:31:21 -0800 (Thu, 08 Nov 2007) | 1 line Replaced a system call by std C library remove() and disabled another system call (backup input file). Partially fixed issue130. All remaining system calls are in lib/Output_gzdir.c. ........ r8245 | tan2 | 2007-11-08 14:41:31 -0800 (Thu, 08 Nov 2007) | 1 line Updated file ChangeLog to r8244 ........
1 parent a828fa9
CitcomSFullImport.net.in
//
// time: Wed Aug 4 11:26:52 2004
//
// version: 3.2.0 (format), 4.3.0 (DX)
//
//
//
// macro reference (indirect): RTFtoXYZ @dxmacrodir@/RTFtoXYZ.net
//
// macro reference (indirect): CitcomSTemperature @dxmacrodir@/CitcomSTemperature.net
//
// macro reference (indirect): VelocityRTFtoXYZ @dxmacrodir@/VelocityRTFtoXYZ.net
//
// macro reference (indirect): CitcomSVelocity @dxmacrodir@/CitcomSVelocity.net
//
// macro reference (indirect): CitcomSViscosity @dxmacrodir@/CitcomSViscosity.net
//
// macro reference (direct): CitcomSImport @dxmacrodir@/CitcomSImport.net
include "CitcomSImport.net"
//
// Begin MDF
// MODULE CitcomSFullImport
// CATEGORY Macros
// DESCRIPTION new macro
// INPUT format_string; string; (none);
// INPUT reduced; scalar list or vector list; (no default);
// INPUT cap_start; integer; (0);
// INPUT cap_end; integer; (11);
// OUTPUT velocity; group;
// OUTPUT temperature; group;
// OUTPUT viscosity; group;
// End MDF
// workspace: width = 705, height = 599
// layout: snap = 0, width = 50, height = 50, align = NN
//
macro CitcomSFullImport(
format_string
,reduced
,cap_start
,cap_end
) -> (
velocity
,temperature
,viscosity
) {
//
// node CollectMultiGrid[1]: x = 334, y = 280, inputs = 4, label = temperature
// input[2]: defaulting = 1, visible = 1, type = 32, value = "cap0"
// input[4]: defaulting = 1, visible = 1, type = 32, value = "cap1"
//
CitcomSFullImport_CollectMultiGrid_1_out_1 =
CollectMultiGrid(
NULL,
NULL,
NULL,
NULL
) [instance: 1, cache: 1];
//
// node GetLocal[1]: x = 378, y = 358, inputs = 3, label = GetLocal
// input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
//
CitcomSFullImport_GetLocal_1_out_1,
CitcomSFullImport_GetLocal_1_out_2 =
GetLocal(
CitcomSFullImport_CollectMultiGrid_1_out_1,
NULL,
NULL
) [instance: 1, cache: 1];
//
// node Input[9]: x = 109, y = 15, inputs = 0, label = Filename Format String
// parameter: position = 1, name = 'format_string', value = '(none)', descriptive = 1, description = ' ', required = 1, visible = 1
//
CitcomSFullImport_Input_9_out_1 = format_string;
//
// node Input[11]: x = 268, y = 15, inputs = 0, label = input_3
// parameter: position = 3, name = 'cap_start', value = '(0)', descriptive = 1, description = ' ', required = 0, visible = 1
//
CitcomSFullImport_Input_11_out_1 = cap_start;
//
// node Input[12]: x = 329, y = 14, inputs = 0, label = Input
// parameter: position = 4, name = 'cap_end', value = '(11)', descriptive = 1, description = ' ', required = 0, visible = 1
//
CitcomSFullImport_Input_12_out_1 = cap_end;
//
// node ForEachN[1]: x = 271, y = 115, inputs = 3, label = ForEachN
// input[1]: defaulting = 1, visible = 1, type = 1, value = 0
// input[2]: defaulting = 1, visible = 1, type = 1, value = 11
// input[3]: visible = 0
//
CitcomSFullImport_ForEachN_1_out_1,
CitcomSFullImport_ForEachN_1_out_2 =
ForEachN(
CitcomSFullImport_Input_11_out_1,
CitcomSFullImport_Input_12_out_1,
NULL
) [instance: 1, cache: 1];
//
// node Format[1]: x = 117, y = 135, inputs = 2, label = Format
// input[1]: defaulting = 1, visible = 1, type = 32, value = "/home/tan2/tmp/benchmarkfull.cap%d.0.general"
//
CitcomSFullImport_Format_1_out_1 =
Format(
CitcomSFullImport_Input_9_out_1,
CitcomSFullImport_ForEachN_1_out_1
) [instance: 1, cache: 1];
//
// node Input[10]: x = 178, y = 13, inputs = 0, label = Reduced Factor
// parameter: position = 2, name = 'reduced', value = '(no default)', descriptive = 1, description = ' ', required = 0, visible = 1
//
CitcomSFullImport_Input_10_out_1 = reduced;
//
// node CitcomSImport[1]: x = 117, y = 216, inputs = 2, label = CitcomSImport
//
CitcomSFullImport_CitcomSImport_1_out_1,
CitcomSFullImport_CitcomSImport_1_out_2,
CitcomSFullImport_CitcomSImport_1_out_3 =
CitcomSImport(
CitcomSFullImport_Format_1_out_1,
CitcomSFullImport_Input_10_out_1
) [instance: 1, cache: 1];
//
// node Append[2]: x = 263, y = 435, inputs = 5, label = Append
//
CitcomSFullImport_Append_2_out_1 =
Append(
CitcomSFullImport_GetLocal_1_out_1,
CitcomSFullImport_CitcomSImport_1_out_2,
NULL,
NULL,
NULL
) [instance: 2, cache: 1];
//
// node CollectMultiGrid[2]: x = 112, y = 296, inputs = 4, label = velocity
//
CitcomSFullImport_CollectMultiGrid_2_out_1 =
CollectMultiGrid(
NULL,
NULL,
NULL,
NULL
) [instance: 2, cache: 1];
//
// node GetLocal[2]: x = 156, y = 365, inputs = 3, label = GetLocal
// input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
//
CitcomSFullImport_GetLocal_2_out_1,
CitcomSFullImport_GetLocal_2_out_2 =
GetLocal(
CitcomSFullImport_CollectMultiGrid_2_out_1,
NULL,
NULL
) [instance: 2, cache: 1];
//
// node Append[3]: x = 26, y = 437, inputs = 5, label = Append
//
CitcomSFullImport_Append_3_out_1 =
Append(
CitcomSFullImport_GetLocal_2_out_1,
CitcomSFullImport_CitcomSImport_1_out_1,
NULL,
NULL,
NULL
) [instance: 3, cache: 1];
//
// node CollectMultiGrid[3]: x = 585, y = 277, inputs = 4, label = temperature
// input[2]: defaulting = 1, visible = 1, type = 32, value = "cap0"
// input[4]: defaulting = 1, visible = 1, type = 32, value = "cap1"
//
CitcomSFullImport_CollectMultiGrid_3_out_1 =
CollectMultiGrid(
NULL,
NULL,
NULL,
NULL
) [instance: 3, cache: 1];
//
// node GetLocal[3]: x = 629, y = 355, inputs = 3, label = GetLocal
// input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
//
CitcomSFullImport_GetLocal_3_out_1,
CitcomSFullImport_GetLocal_3_out_2 =
GetLocal(
CitcomSFullImport_CollectMultiGrid_3_out_1,
NULL,
NULL
) [instance: 3, cache: 1];
//
// node Append[4]: x = 514, y = 432, inputs = 5, label = Append
//
CitcomSFullImport_Append_4_out_1 =
Append(
CitcomSFullImport_GetLocal_3_out_1,
CitcomSFullImport_CitcomSImport_1_out_3,
NULL,
NULL,
NULL
) [instance: 4, cache: 1];
//
// node Output[6]: x = 59, y = 537, inputs = 1, label = velocity
// parameter: position = 1, name = 'velocity', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
velocity = CitcomSFullImport_Append_3_out_1;
//
// node Output[7]: x = 296, y = 531, inputs = 1, label = temperature
// parameter: position = 2, name = 'temperature', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
temperature = CitcomSFullImport_Append_2_out_1;
//
// node Output[8]: x = 547, y = 528, inputs = 1, label = temperature
// parameter: position = 3, name = 'viscosity', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
viscosity = CitcomSFullImport_Append_4_out_1;
//
// node SetLocal[1]: x = 379, y = 509, inputs = 3, label = SetLocal
//
SetLocal(
CitcomSFullImport_Append_2_out_1,
CitcomSFullImport_GetLocal_1_out_2,
NULL
) [instance: 1, cache: 1];
//
// node SetLocal[2]: x = 157, y = 507, inputs = 3, label = SetLocal
//
SetLocal(
CitcomSFullImport_Append_3_out_1,
CitcomSFullImport_GetLocal_2_out_2,
NULL
) [instance: 2, cache: 1];
//
// node SetLocal[3]: x = 630, y = 506, inputs = 3, label = SetLocal
//
SetLocal(
CitcomSFullImport_Append_4_out_1,
CitcomSFullImport_GetLocal_3_out_2,
NULL
) [instance: 3, cache: 1];
// network: end of macro body
}
CitcomSFullImport_CollectMultiGrid_1_out_1 = NULL;
CitcomSFullImport_GetLocal_1_out_1 = NULL;
CitcomSFullImport_GetLocal_1_out_2 = NULL;
CitcomSFullImport_Input_9_out_1 = NULL;
CitcomSFullImport_Input_11_out_1 = NULL;
CitcomSFullImport_Input_12_out_1 = NULL;
CitcomSFullImport_ForEachN_1_out_1 = NULL;
CitcomSFullImport_Format_1_out_1 = NULL;
CitcomSFullImport_Input_10_out_1 = NULL;
CitcomSFullImport_CitcomSImport_1_out_1 = NULL;
CitcomSFullImport_CitcomSImport_1_out_2 = NULL;
CitcomSFullImport_CitcomSImport_1_out_3 = NULL;
CitcomSFullImport_Append_2_out_1 = NULL;
CitcomSFullImport_CollectMultiGrid_2_out_1 = NULL;
CitcomSFullImport_GetLocal_2_out_1 = NULL;
CitcomSFullImport_GetLocal_2_out_2 = NULL;
CitcomSFullImport_Append_3_out_1 = NULL;
CitcomSFullImport_CollectMultiGrid_3_out_1 = NULL;
CitcomSFullImport_GetLocal_3_out_1 = NULL;
CitcomSFullImport_GetLocal_3_out_2 = NULL;
CitcomSFullImport_Append_4_out_1 = NULL;
Computing file changes ...