[cig-commits] r19372 - in mc/3D/CitcomS/branches/v3.1: . lib module/Exchanger visual visual/OpenDXMacro
tan2 at geodynamics.org
tan2 at geodynamics.org
Mon Jan 16 13:21:30 PST 2012
Author: tan2
Date: 2012-01-16 13:21:30 -0800 (Mon, 16 Jan 2012)
New Revision: 19372
Added:
mc/3D/CitcomS/branches/v3.1/visual/OpenDXMacro/CitcomSImportOpt.net
Modified:
mc/3D/CitcomS/branches/v3.1/Makefile.am
mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c
mc/3D/CitcomS/branches/v3.1/module/Exchanger/CitcomInterpolator.cc
mc/3D/CitcomS/branches/v3.1/visual/visFull.cfg
mc/3D/CitcomS/branches/v3.1/visual/visFull.net.in
Log:
Merged r16160, r16161, r16216, and r16349 from trunk to v3.1 branch
Modified: mc/3D/CitcomS/branches/v3.1/Makefile.am
===================================================================
--- mc/3D/CitcomS/branches/v3.1/Makefile.am 2012-01-16 21:18:48 UTC (rev 19371)
+++ mc/3D/CitcomS/branches/v3.1/Makefile.am 2012-01-16 21:21:30 UTC (rev 19372)
@@ -24,7 +24,7 @@
# $Id$
-ACLOCAL_AMFLAGS = -I ./m4
+ACLOCAL_AMFLAGS = -I m4
if COND_PYRE
MAYBE_PYRE = CitcomS etc examples module tests visual
Modified: mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c
===================================================================
--- mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c 2012-01-16 21:18:48 UTC (rev 19371)
+++ mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c 2012-01-16 21:21:30 UTC (rev 19372)
@@ -494,9 +494,9 @@
for(m=1;m<=E->sphere.caps_per_proc;m++)
TT[m] = (float *) malloc ((E->lmesh.nsf+1)*sizeof(float));
+ /* cos coeff */
+ geoid[0] = (float*)malloc(E->sphere.hindice*sizeof(float));
/* sin coeff */
- geoid[0] = (float*)malloc(E->sphere.hindice*sizeof(float));
- /* cos coeff */
geoid[1] = (float*)malloc(E->sphere.hindice*sizeof(float));
/* reset arrays */
Modified: mc/3D/CitcomS/branches/v3.1/module/Exchanger/CitcomInterpolator.cc
===================================================================
--- mc/3D/CitcomS/branches/v3.1/module/Exchanger/CitcomInterpolator.cc 2012-01-16 21:18:48 UTC (rev 19371)
+++ mc/3D/CitcomS/branches/v3.1/module/Exchanger/CitcomInterpolator.cc 2012-01-16 21:21:30 UTC (rev 19372)
@@ -424,7 +424,7 @@
for(int k=0; k<DIM; k++)
norm += (xt[k]-xi[k]) * (xt[k]-xi[k]);
- if(norm > 1.e-10) {
+ if(norm > E->control.accuracy * E->control.accuracy) {
double tshape = 0.0;
for(int j=0; j<NODES_PER_ELEMENT; j++)
tshape += shape_[j][i];
Copied: mc/3D/CitcomS/branches/v3.1/visual/OpenDXMacro/CitcomSImportOpt.net (from rev 16160, mc/3D/CitcomS/trunk/visual/OpenDXMacro/CitcomSImportOpt.net)
===================================================================
--- mc/3D/CitcomS/branches/v3.1/visual/OpenDXMacro/CitcomSImportOpt.net (rev 0)
+++ mc/3D/CitcomS/branches/v3.1/visual/OpenDXMacro/CitcomSImportOpt.net 2012-01-16 21:21:30 UTC (rev 19372)
@@ -0,0 +1,166 @@
+//
+// time: Sat Nov 17 17:06:53 2007
+//
+// version: 3.2.0 (format), 4.3.2 (DX)
+//
+//
+// Begin MDF
+// MODULE CitcomSImportOpt
+// CATEGORY Macros
+// DESCRIPTION Import CitcomS opt file
+// INPUT format_string; string; (none);
+// INPUT field; group or field or series or value list or string list; (none); CitcomS temperature field
+// INPUT cap_start; integer; (0);
+// OPTIONS 0 ; 1
+// INPUT cap_end; integer; (11);
+// OUTPUT opt; group;
+// End MDF
+// workspace: width = 311, height = 607
+// layout: snap = 0, width = 50, height = 50, align = NN
+//
+macro CitcomSImportOpt(
+ format_string
+,field
+,cap_start
+,cap_end
+) -> (
+ opt
+) {
+ //
+ // node CollectMultiGrid[3]: x = 191, y = 283, inputs = 4, label = temperature
+ // input[2]: defaulting = 1, visible = 1, type = 32, value = "cap0"
+ // input[4]: defaulting = 1, visible = 1, type = 32, value = "cap1"
+ //
+CitcomSImportOpt_CollectMultiGrid_3_out_1 =
+ CollectMultiGrid(
+ NULL,
+ NULL,
+ NULL,
+ NULL
+ ) [instance: 3, cache: 1];
+ //
+ // node GetLocal[3]: x = 235, y = 361, inputs = 3, label = GetLocal
+ // input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
+ //
+CitcomSImportOpt_GetLocal_3_out_1,
+CitcomSImportOpt_GetLocal_3_out_2 =
+ GetLocal(
+ CitcomSImportOpt_CollectMultiGrid_3_out_1,
+ NULL,
+ NULL
+ ) [instance: 3, cache: 1];
+ //
+ // node Input[20]: x = 136, y = 7, inputs = 0, label = Input
+ // parameter: position = 2, name = 'field', value = '(none)', descriptive = 1, description = 'CitcomS field', required = 1, visible = 1
+ //
+CitcomSImportOpt_Input_20_out_1 = field;
+ //
+ // node Input[18]: x = 200, y = 6, inputs = 0, label = Input
+ // parameter: position = 3, name = 'cap_start', value = '(0)', descriptive = 1, description = ' ', required = 0, visible = 1
+ //
+CitcomSImportOpt_Input_18_out_1 = cap_start;
+ //
+ // node Input[19]: x = 268, y = 5, inputs = 0, label = Input
+ // parameter: position = 4, name = 'cap_end', value = '(11)', descriptive = 1, description = ' ', required = 0, visible = 1
+ //
+CitcomSImportOpt_Input_19_out_1 = cap_end;
+ //
+ // node ForEachN[1]: x = 203, y = 91, 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
+ //
+CitcomSImportOpt_ForEachN_1_out_1,
+CitcomSImportOpt_ForEachN_1_out_2 =
+ ForEachN(
+ CitcomSImportOpt_Input_18_out_1,
+ CitcomSImportOpt_Input_19_out_1,
+ NULL
+ ) [instance: 1, cache: 1];
+ //
+ // node Select[11]: x = 11, y = 256, inputs = 3, label = Select
+ //
+CitcomSImportOpt_Select_11_out_1 =
+ Select(
+ CitcomSImportOpt_Input_20_out_1,
+ CitcomSImportOpt_ForEachN_1_out_1,
+ NULL
+ ) [instance: 11, cache: 1];
+ //
+ // node Input[21]: x = 62, y = 7, inputs = 0, label = Input
+ // parameter: position = 1, name = 'format_string', value = '(none)', descriptive = 1, description = ' ', required = 1, visible = 1
+ //
+CitcomSImportOpt_Input_21_out_1 = format_string;
+ //
+ // node Format[1]: x = 70, y = 160, inputs = 2, label = Format
+ // input[1]: defaulting = 1, visible = 1, type = 32, value = "/home/tan2/tmp/benchmarkfull.cap%d.0.general"
+ //
+CitcomSImportOpt_Format_1_out_1 =
+ Format(
+ CitcomSImportOpt_Input_21_out_1,
+ CitcomSImportOpt_ForEachN_1_out_1
+ ) [instance: 1, cache: 1];
+ //
+ // node Import[2]: x = 85, y = 256, inputs = 6, label = Import
+ // input[3]: defaulting = 0, visible = 1, type = 32, value = "general"
+ //
+CitcomSImportOpt_Import_2_out_1 =
+ Import(
+ CitcomSImportOpt_Format_1_out_1,
+ NULL,
+ "general",
+ NULL,
+ NULL,
+ NULL
+ ) [instance: 2, cache: 1];
+ //
+ // node Replace[2]: x = 50, y = 356, inputs = 4, label = Replace
+ // input[3]: defaulting = 0, visible = 1, type = 32, value = "positions"
+ // input[4]: defaulting = 0, visible = 1, type = 32, value = "positions"
+ //
+CitcomSImportOpt_Replace_2_out_1 =
+ Replace(
+ CitcomSImportOpt_Select_11_out_1,
+ CitcomSImportOpt_Import_2_out_1,
+ "positions",
+ "positions"
+ ) [instance: 2, cache: 1];
+ //
+ // node Append[4]: x = 120, y = 438, inputs = 5, label = Append
+ //
+CitcomSImportOpt_Append_4_out_1 =
+ Append(
+ CitcomSImportOpt_GetLocal_3_out_1,
+ CitcomSImportOpt_Replace_2_out_1,
+ NULL,
+ NULL,
+ NULL
+ ) [instance: 4, cache: 1];
+ //
+ // node Output[13]: x = 112, y = 545, inputs = 1, label = Output
+ // parameter: position = 1, name = 'opt', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
+ //
+opt = CitcomSImportOpt_Append_4_out_1;
+ //
+ // node SetLocal[3]: x = 236, y = 512, inputs = 3, label = SetLocal
+ //
+ SetLocal(
+ CitcomSImportOpt_Append_4_out_1,
+ CitcomSImportOpt_GetLocal_3_out_2,
+ NULL
+ ) [instance: 3, cache: 1];
+// network: end of macro body
+}
+CitcomSImportOpt_CollectMultiGrid_3_out_1 = NULL;
+CitcomSImportOpt_GetLocal_3_out_1 = NULL;
+CitcomSImportOpt_GetLocal_3_out_2 = NULL;
+CitcomSImportOpt_Input_20_out_1 = NULL;
+CitcomSImportOpt_Input_18_out_1 = NULL;
+CitcomSImportOpt_Input_19_out_1 = NULL;
+CitcomSImportOpt_ForEachN_1_out_1 = NULL;
+CitcomSImportOpt_Select_11_out_1 = NULL;
+CitcomSImportOpt_Input_21_out_1 = NULL;
+CitcomSImportOpt_Format_1_out_1 = NULL;
+CitcomSImportOpt_Import_2_out_1 = NULL;
+CitcomSImportOpt_Replace_2_out_1 = NULL;
+CitcomSImportOpt_Append_4_out_1 = NULL;
Modified: mc/3D/CitcomS/branches/v3.1/visual/visFull.cfg
===================================================================
--- mc/3D/CitcomS/branches/v3.1/visual/visFull.cfg 2012-01-16 21:18:48 UTC (rev 19371)
+++ mc/3D/CitcomS/branches/v3.1/visual/visFull.cfg 2012-01-16 21:21:30 UTC (rev 19372)
@@ -1,5 +1,5 @@
//
-// time: Wed Oct 4 17:18:03 2006
+// time: Thu Jan 21 10:56:00 2010
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
@@ -24,6 +24,9 @@
// local continuous: value = 0, mode = global
// local increment[0]: value = 1, mode = global
//
+// interactor FileSelector[2]: num_components = 1, value = "samples/fulltest.opt%02d.100.general"
+// instance: panel = 1, x = 0, y = 329, style = FileSelector, vertical = 1, size = 264x57
+//
// interactor Scalar[6]: num_components = 1, value = -30.0
// component[0]: minimum = -90, maximum = 90, global increment = 1, decimal = 1, global continuous = 0
// instance: panel = 1, x = 7, y = 200, style = Slider, vertical = 1, size = 212x85
Modified: mc/3D/CitcomS/branches/v3.1/visual/visFull.net.in
===================================================================
--- mc/3D/CitcomS/branches/v3.1/visual/visFull.net.in 2012-01-16 21:18:48 UTC (rev 19371)
+++ mc/3D/CitcomS/branches/v3.1/visual/visFull.net.in 2012-01-16 21:21:30 UTC (rev 19372)
@@ -1,5 +1,5 @@
//
-// time: Wed Oct 4 15:59:54 2006
+// time: Thu Jan 21 10:56:00 2010
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
@@ -17,6 +17,9 @@
//
// macro reference (indirect): CitcomSImport @dxmacrodir@/CitcomSImport.net
//
+// macro reference (direct): CitcomSImportOpt @dxmacrodir@/CitcomSImportOpt.net
+include "CitcomSImportOpt.net"
+//
// macro reference (direct): CitcomSFullImport @dxmacrodir@/CitcomSFullImport.net
include "CitcomSFullImport.net"
//
@@ -121,6 +124,24 @@
main_AutoGlyph_9_in_7
) [instance: 9, cache: 1];
//
+ // node FileSelector[2]: x = 349, y = 39, inputs = 0, label = FileSelector
+ // output[1]: visible = 1, type = 32, value = "samples/fulltest.opt%02d.100.general"
+ // output[2]: visible = 1, type = 32, value = "fulltest.opt%02d.100.general"
+ // page group: import
+ //
+ //
+ // node CitcomSImportOpt[1]: x = 354, y = 271, inputs = 4, label = CitcomSImportOpt
+ // page group: import
+ //
+main_CitcomSImportOpt_1_out_1 =
+ CitcomSImportOpt(
+ main_FileSelector_2_out_1,
+ main_CitcomSFullImport_1_out_2,
+ main_CitcomSImportOpt_1_in_3,
+ main_CitcomSImportOpt_1_in_4
+ ) [instance: 1, cache: 1];
+ //
+ //
// node Transmitter[16]: x = 133, y = 371, inputs = 1, label = temperature
// page group: import
//
@@ -627,6 +648,11 @@
// page group: import
//
viscosity = main_CitcomSFullImport_1_out_3;
+ //
+ // node Transmitter[26]: x = 392, y = 372, inputs = 1, label = opt_field
+ // page group: import
+ //
+opt_field = main_CitcomSImportOpt_1_out_1;
// network: end of macro body
CacheScene(main_Image_3_in_1, main_Image_3_out_1, main_Image_3_out_2);
}
@@ -667,6 +693,10 @@
main_AutoGlyph_9_in_6 = NULL;
main_AutoGlyph_9_in_7 = NULL;
main_AutoGlyph_9_out_1 = NULL;
+main_FileSelector_2_out_1 = "samples/fulltest.opt%02d.100.general";
+main_CitcomSImportOpt_1_in_3 = NULL;
+main_CitcomSImportOpt_1_in_4 = NULL;
+main_CitcomSImportOpt_1_out_1 = NULL;
main_Transmitter_16_out_1 = NULL;
main_Receiver_96_out_1 = NULL;
main_Scalar_6_in_1 = "Scalar_6";
More information about the CIG-COMMITS
mailing list