Changeset 514 for trunk/gui/vizservers/nanovis

Timestamp:

Aug 23, 2006 5:21:53 PM (18 years ago)

Author:

mmc

Message:

Fixed the nanoVIS server to recognize 1-6 numbers per line in the
OpenDX format.

Fixed the starting script to include the proper list of libraries
for LD_LIBRARY_PATH. Otherwise, crontab-launched servers don't
load properly and immediately die.

Location:

trunk/gui/vizservers/nanovis

Files:

• nanovis.cpp (modified) (3 diffs)
• start_server (modified) (1 diff)

trunk/gui/vizservers/nanovis/nanovis.cpp

@@ -1537 +1537 @@
             Rappture::FieldRect3D field(xgrid, ygrid, zgrid);
 
-            double dval;
+            double dval[6];
             int nread = 0;
             int ix = 0;
@@ -1544 +1544 @@
             while (!fin.eof() && nread < npts) {
                 fin.getline(line,sizeof(line)-1);
-                if (sscanf(line, "%lg", &dval) == 1) {
+                int n = sscanf(line, "%lg %lg %lg %lg %lg %lg", &dval[0], &dval[1], &dval[2], &dval[3], &dval[4], &dval[5]);
+
+                for (int p=0; p < n; p++) {
                     int nindex = iz*nx*ny + iy*nx + ix;
-                    field.define(nindex, dval);
+                    field.define(nindex, dval[p]);
                     nread++;
                     if (++iz >= nz) {
@@ -3130 +3132 @@
 int main(int argc, char** argv) 
 { 
-  sleep(30);
 #ifdef XINETD
    init_service();

trunk/gui/vizservers/nanovis/start_server

@@ -4 +4 @@
 export DISPLAY
 
-../nanoscale/server -l 3000 -b 3001 -s 172.18.3.255 -c ./nanovis
+PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/X11R6/bin:/usr/bin/X11:/opt/nanovis/bin
+export PATH
 
+LD_LIBRARY_PATH="/opt/render/lib:/lib:/usr/lib:/usr/local/lib"
+export LD_LIBRARY_PATH
+
+/opt/nanovis/bin/nanoscale -l 4000 -b 4001 -s 172.18.3.255 -c /opt/nanovis/bin/nanovis > /dev/null 2>&1