[cig-commits] r5426 - in mc/3D/CitcomS/trunk: doc/manual/graphics
visual/OpenDXMacro
tan2 at geodynamics.org
tan2 at geodynamics.org
Fri Dec 1 23:41:50 PST 2006
Author: tan2
Date: 2006-12-01 23:41:50 -0800 (Fri, 01 Dec 2006)
New Revision: 5426
Modified:
mc/3D/CitcomS/trunk/doc/manual/graphics/CitcomSImportHDF5.net.gif
mc/3D/CitcomS/trunk/visual/OpenDXMacro/CitcomSImportHDF5.net.in
Log:
Update for new HDF5 layout
Modified: mc/3D/CitcomS/trunk/doc/manual/graphics/CitcomSImportHDF5.net.gif
===================================================================
(Binary files differ)
Modified: mc/3D/CitcomS/trunk/visual/OpenDXMacro/CitcomSImportHDF5.net.in
===================================================================
--- mc/3D/CitcomS/trunk/visual/OpenDXMacro/CitcomSImportHDF5.net.in 2006-12-02 07:14:16 UTC (rev 5425)
+++ mc/3D/CitcomS/trunk/visual/OpenDXMacro/CitcomSImportHDF5.net.in 2006-12-02 07:41:50 UTC (rev 5426)
@@ -1,5 +1,5 @@
//
-// time: Mon Oct 9 12:44:55 2006
+// time: Fri Dec 1 12:24:20 2006
//
// version: 3.2.0 (format), 4.3.2 (DX)
//
@@ -15,22 +15,22 @@
// MODULE CitcomSImportHDF5
// CATEGORY Macros
// DESCRIPTION import CitcomS HDF5 data
-// INPUT filename; string; (none); Filename of CitcomS HDF5 data
+// INPUT filename1; string; (none); Filename of CitcomS HDF5 time-independent data
+// INPUT filename2; string; (none); Filename of CitcomS HDF5 time-dependent data
// INPUT reduced; integer or integer list; (1); Reduce resolution of velocity
-// INPUT frame; integer; 0; Time frame to import
// INPUT caplist; integer or integer list; (0); A list of caps to display
// OPTIONS 0,1,2,3,4,5,6,7,8,9,10,11
// OUTPUT velocity; group;
// OUTPUT temperature; group;
// OUTPUT viscosity; group;
// End MDF
-// workspace: width = 771, height = 858
+// workspace: width = 835, height = 820
// layout: snap = 0, width = 50, height = 50, align = NN
//
macro CitcomSImportHDF5(
- filename
+ filename1
+,filename2
,reduced
-,frame = 0
,caplist
) -> (
velocity
@@ -38,7 +38,7 @@
,viscosity
) {
//
- // node CollectMultiGrid[3]: x = 626, y = 453, inputs = 4, label = temperature
+ // node CollectMultiGrid[3]: x = 635, y = 444, inputs = 4, label = temperature
// input[2]: defaulting = 1, visible = 1, type = 32, value = "cap0"
// input[4]: defaulting = 1, visible = 1, type = 32, value = "cap1"
//
@@ -50,7 +50,7 @@
NULL
) [instance: 3, cache: 1];
//
- // node GetLocal[3]: x = 670, y = 531, inputs = 3, label = GetLocal
+ // node GetLocal[3]: x = 679, y = 522, inputs = 3, label = GetLocal
// input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
//
CitcomSImportHDF5_GetLocal_3_out_1,
@@ -61,17 +61,17 @@
NULL
) [instance: 3, cache: 1];
//
- // node Input[2]: x = 20, y = 4, inputs = 0, label = Input
- // parameter: position = 1, name = 'filename', value = '(none)', descriptive = 1, description = 'Filename of CitcomS HDF5 data', required = 1, visible = 1
+ // node Input[1]: x = 169, y = 4, inputs = 0, label = Input
+ // parameter: position = 2, name = 'filename2', value = '(none)', descriptive = 1, description = 'Filename of CitcomS HDF5 time-dependent data', required = 1, visible = 1
//
-CitcomSImportHDF5_Input_2_out_1 = filename;
+CitcomSImportHDF5_Input_1_out_1 = filename2;
//
- // node Input[4]: x = 321, y = 0, inputs = 0, label = Input
+ // node Input[4]: x = 325, y = 0, inputs = 0, label = Input
// parameter: position = 4, name = 'caplist', value = '(0)', descriptive = 1, description = 'A list of caps to display', required = 0, visible = 1
//
CitcomSImportHDF5_Input_4_out_1 = caplist;
//
- // node Inquire[1]: x = 459, y = 18, inputs = 3, label = Inquire
+ // node Inquire[1]: x = 558, y = 87, inputs = 3, label = Inquire
//
CitcomSImportHDF5_Inquire_1_out_1 =
Inquire(
@@ -80,7 +80,7 @@
NULL
) [instance: 1, cache: 1];
//
- // node Compute[85]: x = 551, y = 47, inputs = 3, label = Compute
+ // node Compute[85]: x = 650, y = 116, inputs = 3, label = Compute
// input[1]: defaulting = 0, visible = 0, type = 32, value = "$0? 2: 1"
// expression: value = a? 2: 1
// name[2]: value = a
@@ -93,7 +93,7 @@
NULL
) [instance: 85, cache: 1];
//
- // node Switch[1]: x = 640, y = 65, inputs = 3, label = Switch
+ // node Switch[1]: x = 739, y = 134, inputs = 3, label = Switch
// input[3]: defaulting = 0, visible = 1, type = 16777245, value = {0}
//
CitcomSImportHDF5_Switch_1_out_1 =
@@ -103,7 +103,7 @@
{0}
) [instance: 1, cache: 1];
//
- // node ForEachMember[1]: x = 330, y = 76, inputs = 1, label = ForEachMember
+ // node ForEachMember[1]: x = 715, y = 219, inputs = 1, label = ForEachMember
//
CitcomSImportHDF5_ForEachMember_1_out_1,
CitcomSImportHDF5_ForEachMember_1_out_2,
@@ -112,27 +112,22 @@
CitcomSImportHDF5_Switch_1_out_1
) [instance: 1, cache: 1];
//
- // node Input[1]: x = 221, y = 1, inputs = 0, label = Input
- // parameter: position = 3, name = 'frame', value = '0', descriptive = 0, description = 'Time frame to import', required = 0, visible = 1
- //
-CitcomSImportHDF5_Input_1_out_1 = frame;
- //
- // node Compute[1]: x = 191, y = 84, inputs = 3, label = Compute
- // input[1]: defaulting = 0, visible = 0, type = 32, value = "[0,0,0,$0,$1]"
- // expression: value = [0,0,0,cap,frame]
+ // node Compute[86]: x = 418, y = 56, inputs = 3, label = Compute
+ // input[1]: defaulting = 0, visible = 0, type = 32, value = "[0,0,0,$0]"
+ // expression: value = [0,0,0,cap]
// name[2]: value = cap
- // name[3]: value = frame
+ // name[3]: value = b
//
-CitcomSImportHDF5_Compute_1_out_1 =
+CitcomSImportHDF5_Compute_86_out_1 =
Compute(
- "[0,0,0,$0,$1]",
+ "[0,0,0,$0]",
CitcomSImportHDF5_ForEachMember_1_out_1,
- CitcomSImportHDF5_Input_1_out_1
- ) [instance: 1, cache: 1];
+ NULL
+ ) [instance: 86, cache: 1];
//
- // node ImportHDF5[7]: x = 507, y = 204, inputs = 12, label = ImportHDF5
+ // node ImportHDF5[7]: x = 516, y = 195, inputs = 12, label = ImportHDF5
// input[2]: defaulting = 1, visible = 1, type = 8, value = [0,0,0,1]
- // input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1,1}
+ // input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1}
// input[4]: defaulting = 1, visible = 1, type = 16777217, value = {1,3,1,2}
// input[5]: defaulting = 0, visible = 1, type = 32, value = "/viscosity"
// input[6]: defaulting = 1, visible = 0, type = 3, value = 1
@@ -142,9 +137,9 @@
CitcomSImportHDF5_ImportHDF5_7_out_1,
CitcomSImportHDF5_ImportHDF5_7_out_2[cache: 0] =
ImportHDF5(
- CitcomSImportHDF5_Input_2_out_1,
- CitcomSImportHDF5_Compute_1_out_1,
- {0,0,0,1,1},
+ CitcomSImportHDF5_Input_1_out_1,
+ CitcomSImportHDF5_Compute_86_out_1,
+ {0,0,0,1},
NULL,
"/viscosity",
NULL,
@@ -156,9 +151,9 @@
NULL
) [instance: 7, cache: 1];
//
- // node ImportHDF5[2]: x = 337, y = 205, inputs = 12, label = ImportHDF5
+ // node ImportHDF5[2]: x = 346, y = 196, inputs = 12, label = ImportHDF5
// input[2]: defaulting = 1, visible = 1, type = 8, value = [0,0,0,1]
- // input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1,1}
+ // input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1}
// input[4]: defaulting = 1, visible = 1, type = 16777217, value = {1,3,1,2}
// input[5]: defaulting = 0, visible = 1, type = 32, value = "/temperature"
// input[6]: defaulting = 1, visible = 0, type = 3, value = 1
@@ -168,9 +163,9 @@
CitcomSImportHDF5_ImportHDF5_2_out_1,
CitcomSImportHDF5_ImportHDF5_2_out_2[cache: 0] =
ImportHDF5(
- CitcomSImportHDF5_Input_2_out_1,
- CitcomSImportHDF5_Compute_1_out_1,
- {0,0,0,1,1},
+ CitcomSImportHDF5_Input_1_out_1,
+ CitcomSImportHDF5_Compute_86_out_1,
+ {0,0,0,1},
NULL,
"/temperature",
NULL,
@@ -182,9 +177,9 @@
NULL
) [instance: 2, cache: 1];
//
- // node ImportHDF5[6]: x = 169, y = 206, inputs = 12, label = ImportHDF5
+ // node ImportHDF5[6]: x = 178, y = 197, inputs = 12, label = ImportHDF5
// input[2]: defaulting = 1, visible = 1, type = 8, value = [0,0,0,1]
- // input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1,1}
+ // input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1}
// input[4]: defaulting = 1, visible = 1, type = 16777217, value = {1,3,1,2}
// input[5]: defaulting = 0, visible = 1, type = 32, value = "/velocity"
// input[6]: defaulting = 1, visible = 0, type = 3, value = 1
@@ -194,9 +189,9 @@
CitcomSImportHDF5_ImportHDF5_6_out_1,
CitcomSImportHDF5_ImportHDF5_6_out_2[cache: 0] =
ImportHDF5(
- CitcomSImportHDF5_Input_2_out_1,
- CitcomSImportHDF5_Compute_1_out_1,
- {0,0,0,1,1},
+ CitcomSImportHDF5_Input_1_out_1,
+ CitcomSImportHDF5_Compute_86_out_1,
+ {0,0,0,1},
NULL,
"/velocity",
NULL,
@@ -208,20 +203,12 @@
1
) [instance: 6, cache: 1];
//
- // node Compute[86]: x = 62, y = 85, inputs = 3, label = Compute
- // input[1]: defaulting = 0, visible = 0, type = 32, value = "[0,0,0,$0]"
- // expression: value = [0,0,0,cap]
- // name[2]: value = cap
- // name[3]: value = b
+ // node Input[2]: x = 0, y = 6, inputs = 0, label = Input
+ // parameter: position = 1, name = 'filename1', value = '(none)', descriptive = 1, description = 'Filename of CitcomS HDF5 time-independent data', required = 1, visible = 1
//
-CitcomSImportHDF5_Compute_86_out_1 =
- Compute(
- "[0,0,0,$0]",
- CitcomSImportHDF5_ForEachMember_1_out_1,
- NULL
- ) [instance: 86, cache: 1];
+CitcomSImportHDF5_Input_2_out_1 = filename1;
//
- // node ImportHDF5[1]: x = 0, y = 206, inputs = 12, label = ImportHDF5
+ // node ImportHDF5[1]: x = 9, y = 197, inputs = 12, label = ImportHDF5
// input[2]: defaulting = 1, visible = 1, type = 16777217, value = {0,1,1}
// input[3]: defaulting = 0, visible = 1, type = 16777217, value = {0,0,0,1}
// input[4]: defaulting = 1, visible = 1, type = 16777217, value = {1,2,1}
@@ -247,7 +234,7 @@
1
) [instance: 1, cache: 1];
//
- // node Rename[1]: x = 24, y = 276, inputs = 3, label = Rename
+ // node Rename[1]: x = 33, y = 267, inputs = 3, label = Rename
// input[2]: defaulting = 0, visible = 1, type = 32, value = "data"
// input[3]: defaulting = 0, visible = 1, type = 32, value = "positions"
//
@@ -258,14 +245,14 @@
"positions"
) [instance: 1, cache: 1];
//
- // node RTFtoXYZ[3]: x = 22, y = 344, inputs = 1, label = RTFtoXYZ
+ // node RTFtoXYZ[3]: x = 31, y = 335, inputs = 1, label = RTFtoXYZ
//
CitcomSImportHDF5_RTFtoXYZ_3_out_1 =
RTFtoXYZ(
CitcomSImportHDF5_Rename_1_out_1
) [instance: 3, cache: 1];
//
- // node Replace[4]: x = 193, y = 300, inputs = 4, label = Replace
+ // node Replace[4]: x = 202, y = 291, inputs = 4, label = Replace
// input[4]: defaulting = 0, visible = 1, type = 32, value = "velocity"
//
CitcomSImportHDF5_Replace_4_out_1 =
@@ -276,7 +263,7 @@
"velocity"
) [instance: 4, cache: 1];
//
- // node Replace[1]: x = 361, y = 299, inputs = 4, label = Replace
+ // node Replace[1]: x = 370, y = 290, inputs = 4, label = Replace
// input[4]: defaulting = 0, visible = 1, type = 32, value = "temperature"
//
CitcomSImportHDF5_Replace_1_out_1 =
@@ -287,7 +274,7 @@
"temperature"
) [instance: 1, cache: 1];
//
- // node Replace[5]: x = 531, y = 298, inputs = 4, label = Replace
+ // node Replace[5]: x = 540, y = 289, inputs = 4, label = Replace
// input[4]: defaulting = 0, visible = 1, type = 32, value = "viscosity"
//
CitcomSImportHDF5_Replace_5_out_1 =
@@ -298,7 +285,7 @@
"viscosity"
) [instance: 5, cache: 1];
//
- // node Mark[20]: x = 567, y = 452, inputs = 2, label = Mark
+ // node Mark[20]: x = 576, y = 443, inputs = 2, label = Mark
// input[2]: defaulting = 0, visible = 1, type = 32, value = "viscosity"
//
CitcomSImportHDF5_Mark_20_out_1 =
@@ -307,7 +294,7 @@
"viscosity"
) [instance: 20, cache: 1];
//
- // node Append[4]: x = 555, y = 608, inputs = 5, label = Append
+ // node Append[4]: x = 564, y = 599, inputs = 5, label = Append
//
CitcomSImportHDF5_Append_4_out_1 =
Append(
@@ -318,7 +305,7 @@
NULL
) [instance: 4, cache: 1];
//
- // node CollectMultiGrid[4]: x = 394, y = 462, inputs = 4, label = temperature
+ // node CollectMultiGrid[4]: x = 403, y = 453, inputs = 4, label = temperature
// input[2]: defaulting = 1, visible = 1, type = 32, value = "cap0"
// input[4]: defaulting = 1, visible = 1, type = 32, value = "cap1"
//
@@ -330,7 +317,7 @@
NULL
) [instance: 4, cache: 1];
//
- // node GetLocal[4]: x = 438, y = 540, inputs = 3, label = GetLocal
+ // node GetLocal[4]: x = 447, y = 531, inputs = 3, label = GetLocal
// input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
//
CitcomSImportHDF5_GetLocal_4_out_1,
@@ -341,7 +328,7 @@
NULL
) [instance: 4, cache: 1];
//
- // node Mark[18]: x = 334, y = 464, inputs = 2, label = Mark
+ // node Mark[18]: x = 343, y = 455, inputs = 2, label = Mark
// input[2]: defaulting = 0, visible = 1, type = 32, value = "temperature"
//
CitcomSImportHDF5_Mark_18_out_1 =
@@ -350,7 +337,7 @@
"temperature"
) [instance: 18, cache: 1];
//
- // node Append[5]: x = 322, y = 617, inputs = 5, label = Append
+ // node Append[5]: x = 331, y = 608, inputs = 5, label = Append
//
CitcomSImportHDF5_Append_5_out_1 =
Append(
@@ -361,7 +348,7 @@
NULL
) [instance: 5, cache: 1];
//
- // node CollectMultiGrid[5]: x = 167, y = 495, inputs = 4, label = temperature
+ // node CollectMultiGrid[5]: x = 176, y = 486, inputs = 4, label = temperature
// input[2]: defaulting = 1, visible = 1, type = 32, value = "cap0"
// input[4]: defaulting = 1, visible = 1, type = 32, value = "cap1"
//
@@ -373,7 +360,7 @@
NULL
) [instance: 5, cache: 1];
//
- // node GetLocal[5]: x = 211, y = 580, inputs = 3, label = GetLocal
+ // node GetLocal[5]: x = 220, y = 571, inputs = 3, label = GetLocal
// input[1]: defaulting = 1, visible = 1, type = 67108863, value = NULL
//
CitcomSImportHDF5_GetLocal_5_out_1,
@@ -384,7 +371,7 @@
NULL
) [instance: 5, cache: 1];
//
- // node Mark[19]: x = 93, y = 430, inputs = 2, label = Mark
+ // node Mark[19]: x = 102, y = 421, inputs = 2, label = Mark
// input[2]: defaulting = 0, visible = 1, type = 32, value = "velocity"
//
CitcomSImportHDF5_Mark_19_out_1 =
@@ -393,12 +380,12 @@
"velocity"
) [instance: 19, cache: 1];
//
- // node Input[3]: x = 126, y = 2, inputs = 0, label = Input
- // parameter: position = 2, name = 'reduced', value = '(1)', descriptive = 1, description = 'Reduce resolution of velocity', required = 0, visible = 1
+ // node Input[3]: x = 251, y = 0, inputs = 0, label = Input
+ // parameter: position = 3, name = 'reduced', value = '(1)', descriptive = 1, description = 'Reduce resolution of velocity', required = 0, visible = 1
//
CitcomSImportHDF5_Input_3_out_1 = reduced;
//
- // node Reduce[1]: x = 103, y = 496, inputs = 2, label = Reduce
+ // node Reduce[1]: x = 112, y = 487, inputs = 2, label = Reduce
//
CitcomSImportHDF5_Reduce_1_out_1 =
Reduce(
@@ -406,14 +393,14 @@
CitcomSImportHDF5_Input_3_out_1
) [instance: 1, cache: 1];
//
- // node VelocityRTFtoXYZ[2]: x = 66, y = 572, inputs = 1, label = VelocityRTFtoXYZ
+ // node VelocityRTFtoXYZ[2]: x = 75, y = 563, inputs = 1, label = VelocityRTFtoXYZ
//
CitcomSImportHDF5_VelocityRTFtoXYZ_2_out_1 =
VelocityRTFtoXYZ(
CitcomSImportHDF5_Reduce_1_out_1
) [instance: 2, cache: 1];
//
- // node Append[6]: x = 96, y = 657, inputs = 5, label = Append
+ // node Append[6]: x = 105, y = 648, inputs = 5, label = Append
//
CitcomSImportHDF5_Append_6_out_1 =
Append(
@@ -424,22 +411,22 @@
NULL
) [instance: 6, cache: 1];
//
- // node Output[1]: x = 129, y = 770, inputs = 1, label = Output
+ // node Output[1]: x = 138, y = 755, inputs = 1, label = Output
// parameter: position = 1, name = 'velocity', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
velocity = CitcomSImportHDF5_Append_6_out_1;
//
- // node Output[2]: x = 355, y = 770, inputs = 1, label = Output
+ // node Output[2]: x = 364, y = 758, inputs = 1, label = Output
// parameter: position = 2, name = 'temperature', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
temperature = CitcomSImportHDF5_Append_5_out_1;
//
- // node Output[3]: x = 588, y = 759, inputs = 1, label = Output
+ // node Output[3]: x = 597, y = 750, inputs = 1, label = Output
// parameter: position = 3, name = 'viscosity', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
//
viscosity = CitcomSImportHDF5_Append_4_out_1;
//
- // node SetLocal[3]: x = 671, y = 682, inputs = 3, label = SetLocal
+ // node SetLocal[3]: x = 680, y = 673, inputs = 3, label = SetLocal
//
SetLocal(
CitcomSImportHDF5_Append_4_out_1,
@@ -447,7 +434,7 @@
NULL
) [instance: 3, cache: 1];
//
- // node SetLocal[4]: x = 439, y = 691, inputs = 3, label = SetLocal
+ // node SetLocal[4]: x = 448, y = 682, inputs = 3, label = SetLocal
//
SetLocal(
CitcomSImportHDF5_Append_5_out_1,
@@ -455,7 +442,7 @@
NULL
) [instance: 4, cache: 1];
//
- // node SetLocal[5]: x = 212, y = 731, inputs = 3, label = SetLocal
+ // node SetLocal[5]: x = 221, y = 722, inputs = 3, label = SetLocal
//
SetLocal(
CitcomSImportHDF5_Append_6_out_1,
@@ -467,18 +454,17 @@
CitcomSImportHDF5_CollectMultiGrid_3_out_1 = NULL;
CitcomSImportHDF5_GetLocal_3_out_1 = NULL;
CitcomSImportHDF5_GetLocal_3_out_2 = NULL;
-CitcomSImportHDF5_Input_2_out_1 = NULL;
+CitcomSImportHDF5_Input_1_out_1 = NULL;
CitcomSImportHDF5_Input_4_out_1 = NULL;
CitcomSImportHDF5_Inquire_1_out_1 = NULL;
CitcomSImportHDF5_Compute_85_out_1 = NULL;
CitcomSImportHDF5_Switch_1_out_1 = NULL;
CitcomSImportHDF5_ForEachMember_1_out_1 = NULL;
-CitcomSImportHDF5_Input_1_out_1 = NULL;
-CitcomSImportHDF5_Compute_1_out_1 = NULL;
+CitcomSImportHDF5_Compute_86_out_1 = NULL;
CitcomSImportHDF5_ImportHDF5_7_out_1 = NULL;
CitcomSImportHDF5_ImportHDF5_2_out_1 = NULL;
CitcomSImportHDF5_ImportHDF5_6_out_1 = NULL;
-CitcomSImportHDF5_Compute_86_out_1 = NULL;
+CitcomSImportHDF5_Input_2_out_1 = NULL;
CitcomSImportHDF5_ImportHDF5_1_out_1 = NULL;
CitcomSImportHDF5_Rename_1_out_1 = NULL;
CitcomSImportHDF5_RTFtoXYZ_3_out_1 = NULL;
More information about the cig-commits
mailing list