Changeset 3736


Ignore:
Timestamp:
Jul 1, 2013 4:25:47 PM (7 years ago)
Author:
gah
Message:

remove deprecated mesh examples

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r3717 r3736  
    4545
    4646all: $(TARGETS)
    47         for i in $(TARGETS) ; do \
    48           $(MAKE) -C $$i all || exit 1 ;\
    49         done
     47
     48$(TARGETS):
     49        $(MAKE) -C $@ all
     50
    5051test:
    5152        $(MAKE) -C test all
  • trunk/examples/Makefile.in

    r3471 r3736  
    3131.PHONY: all install clean distclean $(SUBDIRS)
    3232
    33 all:
    34         for i in $(SUBDIRS) ; do \
    35             $(MAKE) -C $$i all || exit 1 ; \
    36         done
     33all: $(SUBDIRS)
     34
     35$(SUBDIRS):
     36        $(MAKE) -C $@ all
    3737
    3838install:
  • trunk/examples/zoo/mesh/mesh.m

    r3733 r3736  
    1313
    1414switch meshtype
    15   case 'unirect2d'
    16     mesh = 'output.unirect2d';
    17     rpLibPutString(lib, 'output.unirect2d.about.label', \
    18                    'unirect2d mesh (deprecated)', 0);
    19     rpLibPutString(lib, 'output.unirect2d.dim', '2', 0);
    20     rpLibPutString(lib, 'output.unirect2d.units', 'm', 0);
    21     rpLibPutString(lib, 'output.unirect2d.hide', 'yes', 0);
    22 
    23     % Create a unirect2d mesh.  The mesh will be used in the 'field'
    24     % object below. We will specify a mesh and then provide the data
    25     % points to the field.
    26 
    27     rpLibPutString(lib, 'output.unirect2d.xaxis.label', 'Fermi-Dirac Factor',0);
    28     rpLibPutString(lib, 'output.unirect2d.yaxis.label', 'Energy', 0);
    29 
    30     % The uniform grid that we are specifying is a mesh of 50 points on
    31     % the x-axis and 50 points on the y-axis.  The 50 points are
    32     % equidistant between 0.0 and 1.0
    33 
    34     % Specify the x-axis of the mesh
    35     rpLibPutString(lib, 'output.unirect2d.xaxis.min', '0.0', 0);
    36     rpLibPutString(lib, 'output.unirect2d.xaxis.max', '1.0', 0);
    37     rpLibPutString(lib, 'output.unirect2d.xaxis.numpoints', '50', 0);
    38    
    39     % Specify the y-axis of the mesh
    40     rpLibPutString(lib, 'output.unirect2d.yaxis.min', '0.0', 0);
    41     rpLibPutString(lib, 'output.unirect2d.yaxis.max', '1.0', 0);
    42     rpLibPutString(lib, 'output.unirect2d.yaxis.numpoints', '50', 0);
    43 
    44   case 'oldcloud'
    45     mesh = 'output.cloud';
    46     rpLibPutString(lib, 'output.cloud.about.label', 'cloud (deprecated)', 0);
    47     rpLibPutString(lib, 'output.cloud.dim', '2', 0);
    48     rpLibPutString(lib, 'output.cloud.units', 'm', 0);
    49     rpLibPutString(lib, 'output.cloud.hide', 'yes', 0);
    50 
    51     xv = linspace(0, 1, 50)
    52     for i = 1:50
    53       for j = 1:50
    54         string = sprintf('%12g  %12g\n', xv(i), xv(j));
    55         rpLibPutString(lib, 'output.cloud.points', string, 1);
    56       endfor
    57     endfor
    58 
    5915  case 'cloud'
    6016    mesh = 'output.mesh';
  • trunk/examples/zoo/mesh/mesh.tcl

    r3733 r3736  
    2222
    2323switch -- $meshtype {
    24     "unirect2d" {
    25         set mesh "output.unirect2d"
    26 
    27         $driver put $mesh.about.label "unirect2d mesh"
    28         $driver put $mesh.dim  2
    29         $driver put $mesh.units "m"
    30         $driver put $mesh.hide "yes"
    31 
    32         # Create a unirect2d mesh.  The mesh will be used in the "field"
    33         # object below. We will specify a mesh and then provide the data
    34         # points to the field.
    35 
    36         $driver put $mesh.xaxis.label "Fermi-Dirac Factor"
    37         $driver put $mesh.yaxis.label "Energy"
    38 
    39         # The uniform grid that we are specifying is a mesh of 50 points on
    40         # the x-axis # and 50 points on the y-axis.  The 50 points are
    41         # equidistant between 0.0 and # 1.0
    42 
    43         # Specify the x-axis of the mesh
    44         $driver put $mesh.xaxis.min 0.0
    45         $driver put $mesh.xaxis.max 1.0
    46         $driver put $mesh.xaxis.numpoints 50
    47        
    48         # Specify the y-axis of the mesh
    49         $driver put $mesh.yaxis.min 0.0
    50         $driver put $mesh.yaxis.max 1.0
    51         $driver put $mesh.yaxis.numpoints 50
    52     }
    53     "oldcloud" {
    54         set mesh output.cloud
    55         $driver put $mesh.about.label "cloud (deprecated)"
    56         $driver put $mesh.dim  2
    57         $driver put $mesh.units "m"
    58         $driver put $mesh.hide "yes"
    59 
    60         set points {}
    61         foreach y [$xv range 0 end] {
    62             foreach x [$xv range 0 end] {
    63                 append points "$x $y\n"
    64             }
    65         }
    66    
    67         # Test old-style cloud element.
    68         $driver put $mesh.units "m"
    69         $driver put $mesh.points $points
    70     }
    7124    "cloud" {
    7225        set mesh output.mesh
  • trunk/examples/zoo/mesh/tool.xml

    r3483 r3736  
    77 <input>
    88   <choice id="mesh">
    9     <option>
    10      <about>
    11       <label>unirect2d (deprecated)</label>
    12       <description>Uniform 2D grid using old-style unirect2d element.</description>
    13      </about>
    14      <value>unirect2d</value>
    15     </option>
    16     <option>
    17      <about>
    18       <label>cloud (deprecated)</label>
    19       <description>2 dimensional cloud of points using old-style cloud element.</description>
    20      </about>
    21      <value>oldcloud</value>
    22     </option>
    239    <option>
    2410     <about>
  • trunk/examples/zoo/mesh/tool2.xml

    r3732 r3736  
    77 <input>
    88   <choice id="mesh">
    9     <option>
    10      <about>
    11       <label>unirect2d (deprecated)</label>
    12       <description>Uniform 2D grid using old-style unirect2d element.</description>
    13      </about>
    14      <value>unirect2d</value>
    15     </option>
    16     <option>
    17      <about>
    18       <label>cloud (deprecated)</label>
    19       <description>2 dimensional cloud of points using old-style cloud element.</description>
    20      </about>
    21      <value>oldcloud</value>
    229    </option>
    2310    <option>
  • trunk/lang/Makefile.in

    r3603 r3736  
    5252endif
    5353
    54 .PHONY: all install test clean distclean tcl octave matlab perl python ruby java R
     54.PHONY: all install test clean distclean $(LANGS)
    5555
    56 all:
    57         for i in $(LANGS) ; do \
    58           $(MAKE) -C $$i all || exit 1 ;\
    59         done
     56
     57all: $(LANGS)
     58
     59$(LANGS):
     60        $(MAKE) -C $@ all
    6061
    6162install:
  • trunk/lang/tcl/src/Rappture_Init.c

    r3733 r3736  
    4444Rappture_Init( Tcl_Interp * interp)
    4545{
    46     fprintf(stderr, "Rappture_init\n");
    4746#ifdef _WIN32
    4847    rpWinInitJob();
     
    5251    }
    5352    if (Tcl_PkgProvide(interp, "Rappture", RAPPTURE_VERSION) != TCL_OK) {
    54         return TCL_ERROR;
    55     }
    56     if (Tcl_SetVar(interp, "::Rappture::version", RAPPTURE_VERSION,
    57                    TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL) {
    58         return TCL_ERROR;
    59     }
    60     if (Tcl_SetVar(interp, "::Rappture::build", SVN_VERSION,
    61                    TCL_GLOBAL_ONLY | TCL_LEAVE_ERR_MSG) == NULL) {
    6253        return TCL_ERROR;
    6354    }
Note: See TracChangeset for help on using the changeset viewer.