[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203
Stephane Popinet
popinet at users.sf.net
Fri May 15 02:54:16 UTC 2009
The following commit has been merged in the upstream branch:
commit d7916132320c06e7900b5d32946cc886d5350ecc
Author: Stephane Popinet <popinet at users.sf.net>
Date: Fri Apr 20 08:28:39 2007 +1000
Docs are not included in the distribution tarball anymore
darcs-hash:20070419222839-d4795-1b0735cd9252dd01c788afed5d65117f053fbf6e.gz
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a4c9d3f..aeebe08 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -13,7 +13,7 @@ DOC_SOURCE_DIR=../src
TARGET_DIR=html/$(DOC_MODULE)
-EXTRA_DIST=html figures
+EXTRA_DIST=figures
scan:
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers=""
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index ae85968..0309f77 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -30,7 +30,7 @@ BUILT_SOURCES= \
CLEANFILES = $(BUILT_SOURCES) Makefile.deps
-dist_pkglib_DATA = gfs2tex.py gfsclasses.py
+pkglib_DATA = gfs2tex.py gfsclasses.py
gfsclasses.py: classes
$(srcdir)/classes > gfsclasses.py
diff --git a/doc/tutorial/Makefile.am b/doc/tutorial/Makefile.am
index bb52206..43d19c4 100644
--- a/doc/tutorial/Makefile.am
+++ b/doc/tutorial/Makefile.am
@@ -1,8 +1,5 @@
## Process this file with automake to produce Makefile.in
-EXTRA_DIST=tutorial.ps.gz tutorial.pdf tutorial.tar.gz half-cylinder.gts \
- gfs2D.net
-
Makefile.deps: Makefile.am tutorial.tex
awk -f depend.awk file="tutorial" < tutorial.tex > Makefile.deps
diff --git a/doc/tutorial/gfs2D.net b/doc/tutorial/gfs2D.net
deleted file mode 100644
index f00faf7..0000000
--- a/doc/tutorial/gfs2D.net
+++ /dev/null
@@ -1,662 +0,0 @@
-//
-// time: Thu Nov 28 17:49:59 2002
-//
-// version: 3.1.2 (format), 4.2.0 (DX)
-//
-//
-// MODULE main
-// workspace: width = 271, height = 555
-// layout: snap = 0, width = 50, height = 50, align = NN
-//
-macro main(
-) -> (
-) {
- //
- // node ImportGfs2D[1]: x = 94, y = 8, inputs = 1, label = ImportGfs2D
- // input[1]: defaulting = 0, visible = 0, type = 32, value = "half-cylinder-0.5.sim"
- //
-main_ImportGfs2D_1_out_1 =
- ImportGfs2D(
- main_ImportGfs2D_1_in_1
- ) [instance: 1, cache: 1];
- //
- // node Select[2]: x = 26, y = 100, inputs = 3, label = Select
- // input[2]: defaulting = 0, visible = 0, type = 32, value = "solid"
- //
-main_Select_2_out_1 =
- Select(
- main_ImportGfs2D_1_out_1,
- main_Select_2_in_2,
- main_Select_2_in_3
- ) [instance: 2, cache: 1];
- //
- // node Color[1]: x = 28, y = 172, inputs = 5, label = Color
- // input[2]: defaulting = 0, visible = 0, type = 32, value = "white"
- // input[3]: defaulting = 0, visible = 0, type = 5, value = 1.0
- //
-main_Color_1_out_1 =
- Color(
- main_Select_2_out_1,
- main_Color_1_in_2,
- main_Color_1_in_3,
- main_Color_1_in_4,
- main_Color_1_in_5
- ) [instance: 1, cache: 1];
- //
- // node Shade[1]: x = 25, y = 265, inputs = 8, label = Shade
- // input[2]: visible = 0
- // input[3]: defaulting = 0, visible = 0, type = 32, value = "faceted"
- //
-main_Shade_1_out_1 =
- Shade(
- main_Color_1_out_1,
- main_Shade_1_in_2,
- main_Shade_1_in_3,
- main_Shade_1_in_4,
- main_Shade_1_in_5,
- main_Shade_1_in_6,
- main_Shade_1_in_7,
- main_Shade_1_in_8
- ) [instance: 1, cache: 1];
- //
- // node Select[1]: x = 116, y = 98, inputs = 3, label = Select
- // input[2]: defaulting = 0, visible = 0, type = 32, value = "P"
- //
-main_Select_1_out_1 =
- Select(
- main_ImportGfs2D_1_out_1,
- main_Select_1_in_2,
- main_Select_1_in_3
- ) [instance: 1, cache: 1];
- //
- // node AutoColor[1]: x = 101, y = 265, inputs = 10, label = AutoColor
- // input[7]: visible = 0
- //
-main_AutoColor_1_out_1,
-main_AutoColor_1_out_2 =
- AutoColor(
- main_Select_1_out_1,
- main_AutoColor_1_in_2,
- main_AutoColor_1_in_3,
- main_AutoColor_1_in_4,
- main_AutoColor_1_in_5,
- main_AutoColor_1_in_6,
- main_AutoColor_1_in_7,
- main_AutoColor_1_in_8,
- main_AutoColor_1_in_9,
- main_AutoColor_1_in_10
- ) [instance: 1, cache: 1];
- //
- // node Collect[1]: x = 37, y = 365, inputs = 2, label = Collect
- //
-main_Collect_1_out_1 =
- Collect(
- main_Shade_1_out_1,
- main_AutoColor_1_out_1
- ) [instance: 1, cache: 1];
- //
- // node Select[4]: x = 207, y = 98, inputs = 3, label = Select
- // input[2]: defaulting = 0, visible = 0, type = 32, value = "U"
- //
-main_Select_4_out_1 =
- Select(
- main_ImportGfs2D_1_out_1,
- main_Select_4_in_2,
- main_Select_4_in_3
- ) [instance: 4, cache: 1];
- //
- // node AutoGlyph[1]: x = 191, y = 172, inputs = 7, label = AutoGlyph
- // input[2]: visible = 0
- // input[3]: defaulting = 1, visible = 0, type = 5, value = 0.5
- // input[4]: defaulting = 1, visible = 0, type = 5, value = 0.5
- // input[5]: defaulting = 1, visible = 0, type = 5, value = 0.01
- //
-main_AutoGlyph_1_out_1 =
- AutoGlyph(
- main_Select_4_out_1,
- main_AutoGlyph_1_in_2,
- main_AutoGlyph_1_in_3,
- main_AutoGlyph_1_in_4,
- main_AutoGlyph_1_in_5,
- main_AutoGlyph_1_in_6,
- main_AutoGlyph_1_in_7
- ) [instance: 1, cache: 1];
- //
- // node Color[2]: x = 209, y = 267, inputs = 5, label = Color
- // input[2]: defaulting = 0, visible = 0, type = 32, value = "black"
- // input[3]: defaulting = 0, visible = 0, type = 5, value = 1.0
- //
-main_Color_2_out_1 =
- Color(
- main_AutoGlyph_1_out_1,
- main_Color_2_in_2,
- main_Color_2_in_3,
- main_Color_2_in_4,
- main_Color_2_in_5
- ) [instance: 2, cache: 1];
- //
- // node Collect[2]: x = 190, y = 364, inputs = 2, label = Collect
- //
-main_Collect_2_out_1 =
- Collect(
- main_Collect_1_out_1,
- main_Color_2_out_1
- ) [instance: 2, cache: 1];
- //
- // node AutoCamera[2]: x = 153, y = 493, inputs = 9, label = AutoCamera
- // input[2]: defaulting = 0, visible = 1, type = 8, value = NULL
- // input[3]: defaulting = 0, visible = 1, type = 5, value = 4.0
- //
-main_AutoCamera_2_out_1 =
- AutoCamera(
- main_Collect_2_out_1,
- main_AutoCamera_2_in_2,
- main_AutoCamera_2_in_3,
- main_AutoCamera_2_in_4,
- main_AutoCamera_2_in_5,
- main_AutoCamera_2_in_6,
- main_AutoCamera_2_in_7,
- main_AutoCamera_2_in_8,
- main_AutoCamera_2_in_9
- ) [instance: 2, cache: 1];
- //
- // node Image[1]: x = 61, y = 492, inputs = 49, label = Image
- // input[1]: defaulting = 0, visible = 0, type = 32, value = "Image_1"
- // input[4]: defaulting = 0, visible = 0, type = 1, value = 1
- // input[5]: defaulting = 0, visible = 0, type = 8, value = [1.52538 1.49012e-08 0]
- // input[6]: defaulting = 0, visible = 0, type = 8, value = [1.52538 1.49012e-08 7.46408]
- // input[7]: defaulting = 0, visible = 0, type = 5, value = 4.0
- // input[8]: defaulting = 0, visible = 0, type = 1, value = 640
- // input[9]: defaulting = 0, visible = 0, type = 5, value = 0.75
- // input[10]: defaulting = 0, visible = 0, type = 8, value = [0 1 0]
- // input[11]: defaulting = 1, visible = 0, type = 5, value = 30.0001
- // input[12]: defaulting = 0, visible = 0, type = 1, value = 0
- // input[14]: defaulting = 0, visible = 0, type = 1, value = 1
- // input[15]: defaulting = 1, visible = 0, type = 32, value = "none"
- // input[16]: defaulting = 1, visible = 0, type = 32, value = "none"
- // input[17]: defaulting = 1, visible = 0, type = 1, value = 1
- // input[18]: defaulting = 1, visible = 0, type = 1, value = 1
- // input[19]: defaulting = 0, visible = 0, type = 1, value = 0
- // input[20]: visible = 1
- // input[21]: defaulting = 0, visible = 0, type = 3, value = 0
- // input[29]: defaulting = 1, visible = 0, type = 3, value = 0
- // input[41]: defaulting = 0, visible = 0, type = 32, value = "panzoom"
- // depth: value = 24
- // window: position = (0.4734,0.0889), size = 0.5109x0.5117
- // internal caching: 1
- //
-main_Image_1_out_1,
-main_Image_1_out_2,
-main_Image_1_out_3 =
- Image(
- main_Image_1_in_1,
- main_Collect_2_out_1,
- main_Image_1_in_3,
- main_Image_1_in_4,
- main_Image_1_in_5,
- main_Image_1_in_6,
- main_Image_1_in_7,
- main_Image_1_in_8,
- main_Image_1_in_9,
- main_Image_1_in_10,
- main_Image_1_in_11,
- main_Image_1_in_12,
- main_Image_1_in_13,
- main_Image_1_in_14,
- main_Image_1_in_15,
- main_Image_1_in_16,
- main_Image_1_in_17,
- main_Image_1_in_18,
- main_Image_1_in_19,
- main_AutoCamera_2_out_1,
- main_Image_1_in_21,
- main_Image_1_in_22,
- main_Image_1_in_23,
- main_Image_1_in_24,
- main_Image_1_in_25,
- main_Image_1_in_26,
- main_Image_1_in_27,
- main_Image_1_in_28,
- main_Image_1_in_29,
- main_Image_1_in_30,
- main_Image_1_in_31,
- main_Image_1_in_32,
- main_Image_1_in_33,
- main_Image_1_in_34,
- main_Image_1_in_35,
- main_Image_1_in_36,
- main_Image_1_in_37,
- main_Image_1_in_38,
- main_Image_1_in_39,
- main_Image_1_in_40,
- main_Image_1_in_41,
- main_Image_1_in_42,
- main_Image_1_in_43,
- main_Image_1_in_44,
- main_Image_1_in_45,
- main_Image_1_in_46,
- main_Image_1_in_47,
- main_Image_1_in_48,
- main_Image_1_in_49
- ) [instance: 1, cache: 1];
-// network: end of macro body
-CacheScene(main_Image_1_in_1, main_Image_1_out_1, main_Image_1_out_2);
-}
-main_ImportGfs2D_1_in_1 = "half-cylinder-0.5.sim";
-main_ImportGfs2D_1_out_1 = NULL;
-main_Select_2_in_2 = "solid";
-main_Select_2_in_3 = NULL;
-main_Select_2_out_1 = NULL;
-main_Color_1_in_2 = "white";
-main_Color_1_in_3 = 1.0;
-main_Color_1_in_4 = NULL;
-main_Color_1_in_5 = NULL;
-main_Color_1_out_1 = NULL;
-main_Shade_1_in_2 = NULL;
-main_Shade_1_in_3 = "faceted";
-main_Shade_1_in_4 = NULL;
-main_Shade_1_in_5 = NULL;
-main_Shade_1_in_6 = NULL;
-main_Shade_1_in_7 = NULL;
-main_Shade_1_in_8 = NULL;
-main_Shade_1_out_1 = NULL;
-main_Select_1_in_2 = "P";
-main_Select_1_in_3 = NULL;
-main_Select_1_out_1 = NULL;
-main_AutoColor_1_in_2 = NULL;
-main_AutoColor_1_in_3 = NULL;
-main_AutoColor_1_in_4 = NULL;
-main_AutoColor_1_in_5 = NULL;
-main_AutoColor_1_in_6 = NULL;
-main_AutoColor_1_in_7 = NULL;
-main_AutoColor_1_in_8 = NULL;
-main_AutoColor_1_in_9 = NULL;
-main_AutoColor_1_in_10 = NULL;
-main_AutoColor_1_out_1 = NULL;
-main_Collect_1_out_1 = NULL;
-main_Select_4_in_2 = "U";
-main_Select_4_in_3 = NULL;
-main_Select_4_out_1 = NULL;
-main_AutoGlyph_1_in_2 = NULL;
-main_AutoGlyph_1_in_3 = NULL;
-main_AutoGlyph_1_in_4 = NULL;
-main_AutoGlyph_1_in_5 = NULL;
-main_AutoGlyph_1_in_6 = NULL;
-main_AutoGlyph_1_in_7 = NULL;
-main_AutoGlyph_1_out_1 = NULL;
-main_Color_2_in_2 = "black";
-main_Color_2_in_3 = 1.0;
-main_Color_2_in_4 = NULL;
-main_Color_2_in_5 = NULL;
-main_Color_2_out_1 = NULL;
-main_Collect_2_out_1 = NULL;
-main_AutoCamera_2_in_2 = NULL;
-main_AutoCamera_2_in_3 = 4.0;
-main_AutoCamera_2_in_4 = NULL;
-main_AutoCamera_2_in_5 = NULL;
-main_AutoCamera_2_in_6 = NULL;
-main_AutoCamera_2_in_7 = NULL;
-main_AutoCamera_2_in_8 = NULL;
-main_AutoCamera_2_in_9 = NULL;
-main_AutoCamera_2_out_1 = NULL;
-macro Image(
- id,
- object,
- where,
- useVector,
- to,
- from,
- width,
- resolution,
- aspect,
- up,
- viewAngle,
- perspective,
- options,
- buttonState = 1,
- buttonUpApprox = "none",
- buttonDownApprox = "none",
- buttonUpDensity = 1,
- buttonDownDensity = 1,
- renderMode = 0,
- defaultCamera,
- reset,
- backgroundColor,
- throttle,
- RECenable = 0,
- RECfile,
- RECformat,
- RECresolution,
- RECaspect,
- AAenable = 0,
- AAlabels,
- AAticks,
- AAcorners,
- AAframe,
- AAadjust,
- AAcursor,
- AAgrid,
- AAcolors,
- AAannotation,
- AAlabelscale,
- AAfont,
- interactionMode,
- title,
- AAxTickLocs,
- AAyTickLocs,
- AAzTickLocs,
- AAxTickLabels,
- AAyTickLabels,
- AAzTickLabels,
- webOptions) -> (
- object,
- camera,
- where)
-{
- ImageMessage(
- id,
- backgroundColor,
- throttle,
- RECenable,
- RECfile,
- RECformat,
- RECresolution,
- RECaspect,
- AAenable,
- AAlabels,
- AAticks,
- AAcorners,
- AAframe,
- AAadjust,
- AAcursor,
- AAgrid,
- AAcolors,
- AAannotation,
- AAlabelscale,
- AAfont,
- AAxTickLocs,
- AAyTickLocs,
- AAzTickLocs,
- AAxTickLabels,
- AAyTickLabels,
- AAzTickLabels,
- interactionMode,
- title,
- renderMode,
- buttonUpApprox,
- buttonDownApprox,
- buttonUpDensity,
- buttonDownDensity) [instance: 1, cache: 1];
- autoCamera =
- AutoCamera(
- object,
- "front",
- object,
- resolution,
- aspect,
- [0,1,0],
- perspective,
- viewAngle,
- backgroundColor) [instance: 1, cache: 1];
- realCamera =
- Camera(
- to,
- from,
- width,
- resolution,
- aspect,
- up,
- perspective,
- viewAngle,
- backgroundColor) [instance: 1, cache: 1];
- coloredDefaultCamera =
- UpdateCamera(defaultCamera,
- background=backgroundColor) [instance: 1, cache: 1];
- nullDefaultCamera =
- Inquire(defaultCamera,
- "is null + 1") [instance: 1, cache: 1];
- resetCamera =
- Switch(
- nullDefaultCamera,
- coloredDefaultCamera,
- autoCamera) [instance: 1, cache: 1];
- resetNull =
- Inquire(
- reset,
- "is null + 1") [instance: 2, cache: 1];
- reset =
- Switch(
- resetNull,
- reset,
- 0) [instance: 2, cache: 1];
- whichCamera =
- Compute(
- "($0 != 0 || $1 == 0) ? 1 : 2",
- reset,
- useVector) [instance: 1, cache: 1];
- camera = Switch(
- whichCamera,
- resetCamera,
- realCamera) [instance: 3, cache: 1];
- AAobject =
- AutoAxes(
- object,
- camera,
- AAlabels,
- AAticks,
- AAcorners,
- AAframe,
- AAadjust,
- AAcursor,
- AAgrid,
- AAcolors,
- AAannotation,
- AAlabelscale,
- AAfont,
- AAxTickLocs,
- AAyTickLocs,
- AAzTickLocs,
- AAxTickLabels,
- AAyTickLabels,
- AAzTickLabels) [instance: 1, cache: 1];
- switchAAenable = Compute("$0+1",
- AAenable) [instance: 2, cache: 1];
- object = Switch(
- switchAAenable,
- object,
- AAobject) [instance:4, cache: 1];
- SWapproximation_options =
- Switch(
- buttonState,
- buttonUpApprox,
- buttonDownApprox) [instance: 5, cache: 1];
- SWdensity_options =
- Switch(
- buttonState,
- buttonUpDensity,
- buttonDownDensity) [instance: 6, cache: 1];
- HWapproximation_options =
- Format(
- "%s,%s",
- buttonDownApprox,
- buttonUpApprox) [instance: 1, cache: 1];
- HWdensity_options =
- Format(
- "%d,%d",
- buttonDownDensity,
- buttonUpDensity) [instance: 2, cache: 1];
- switchRenderMode = Compute(
- "$0+1",
- renderMode) [instance: 3, cache: 1];
- approximation_options = Switch(
- switchRenderMode,
- SWapproximation_options,
- HWapproximation_options) [instance: 7, cache: 1];
- density_options = Switch(
- switchRenderMode,
- SWdensity_options,
- HWdensity_options) [instance: 8, cache: 1];
- renderModeString = Switch(
- switchRenderMode,
- "software",
- "hardware")[instance: 9, cache: 1];
- object_tag = Inquire(
- object,
- "object tag")[instance: 3, cache: 1];
- annoted_object =
- Options(
- object,
- "send boxes",
- 0,
- "cache",
- 1,
- "object tag",
- object_tag,
- "ddcamera",
- whichCamera,
- "rendering approximation",
- approximation_options,
- "render every",
- density_options,
- "button state",
- buttonState,
- "rendering mode",
- renderModeString) [instance: 1, cache: 1];
- RECresNull =
- Inquire(
- RECresolution,
- "is null + 1") [instance: 4, cache: 1];
- ImageResolution =
- Inquire(
- camera,
- "camera resolution") [instance: 5, cache: 1];
- RECresolution =
- Switch(
- RECresNull,
- RECresolution,
- ImageResolution) [instance: 10, cache: 1];
- RECaspectNull =
- Inquire(
- RECaspect,
- "is null + 1") [instance: 6, cache: 1];
- ImageAspect =
- Inquire(
- camera,
- "camera aspect") [instance: 7, cache: 1];
- RECaspect =
- Switch(
- RECaspectNull,
- RECaspect,
- ImageAspect) [instance: 11, cache: 1];
- switchRECenable = Compute(
- "$0 == 0 ? 1 : (($2 == $3) && ($4 == $5)) ? ($1 == 1 ? 2 : 3) : 4",
- RECenable,
- switchRenderMode,
- RECresolution,
- ImageResolution,
- RECaspect,
- ImageAspect) [instance: 4, cache: 1];
- NoRECobject, RECNoRerenderObject, RECNoRerHW, RECRerenderObject = Route(switchRECenable, annoted_object);
- Display(
- NoRECobject,
- camera,
- where,
- throttle) [instance: 1, cache: 1];
- image =
- Render(
- RECNoRerenderObject,
- camera) [instance: 1, cache: 1];
- Display(
- image,
- NULL,
- where,
- throttle) [instance: 2, cache: 1];
- WriteImage(
- image,
- RECfile,
- RECformat) [instance: 1, cache: 1];
- rec_where = Display(
- RECNoRerHW,
- camera,
- where,
- throttle) [instance: 1, cache: 0];
- rec_image = ReadImageWindow(
- rec_where) [instance: 1, cache: 1];
- WriteImage(
- rec_image,
- RECfile,
- RECformat) [instance: 1, cache: 1];
- RECupdateCamera =
- UpdateCamera(
- camera,
- resolution=RECresolution,
- aspect=RECaspect) [instance: 2, cache: 1];
- Display(
- RECRerenderObject,
- camera,
- where,
- throttle) [instance: 1, cache: 1];
- RECRerenderObject =
- ScaleScreen(
- RECRerenderObject,
- NULL,
- RECresolution,
- camera) [instance: 1, cache: 1];
- image =
- Render(
- RECRerenderObject,
- RECupdateCamera) [instance: 2, cache: 1];
- WriteImage(
- image,
- RECfile,
- RECformat) [instance: 2, cache: 1];
-}
-main_Image_1_in_1 = "Image_1";
-main_Image_1_in_3 = "X24,,";
-main_Image_1_in_4 = 1;
-main_Image_1_in_5 = [1.52538 1.49012e-08 0];
-main_Image_1_in_6 = [1.52538 1.49012e-08 7.46408];
-main_Image_1_in_7 = 4.0;
-main_Image_1_in_8 = 640;
-main_Image_1_in_9 = 0.75;
-main_Image_1_in_10 = [0 1 0];
-main_Image_1_in_11 = NULL;
-main_Image_1_in_12 = 0;
-main_Image_1_in_13 = NULL;
-main_Image_1_in_14 = 1;
-main_Image_1_in_15 = NULL;
-main_Image_1_in_16 = NULL;
-main_Image_1_in_17 = NULL;
-main_Image_1_in_18 = NULL;
-main_Image_1_in_19 = 0;
-main_Image_1_in_21 = 0;
-main_Image_1_in_22 = NULL;
-main_Image_1_in_23 = NULL;
-main_Image_1_in_25 = NULL;
-main_Image_1_in_26 = NULL;
-main_Image_1_in_27 = NULL;
-main_Image_1_in_28 = NULL;
-main_Image_1_in_29 = NULL;
-main_Image_1_in_30 = NULL;
-main_Image_1_in_31 = NULL;
-main_Image_1_in_32 = NULL;
-main_Image_1_in_33 = NULL;
-main_Image_1_in_34 = NULL;
-main_Image_1_in_35 = NULL;
-main_Image_1_in_36 = NULL;
-main_Image_1_in_37 = NULL;
-main_Image_1_in_38 = NULL;
-main_Image_1_in_39 = NULL;
-main_Image_1_in_40 = NULL;
-main_Image_1_in_41 = "panzoom";
-main_Image_1_in_42 = NULL;
-main_Image_1_in_43 = NULL;
-main_Image_1_in_44 = NULL;
-main_Image_1_in_45 = NULL;
-main_Image_1_in_46 = NULL;
-main_Image_1_in_47 = NULL;
-main_Image_1_in_48 = NULL;
-main_Image_1_in_49 = NULL;
-Executive("product version 4 2 0");
-$sync
-main();
--
Gerris Flow Solver
More information about the debian-science-commits
mailing list