--- MITgcm_contrib/darwinview/src/darwin.c	2007/07/16 19:16:26	1.5
+++ MITgcm_contrib/darwinview/src/darwin.c	2007/07/24 16:53:55	1.6
@@ -23,7 +23,7 @@
 int xmax, ymax, yoffset=0, xoffset=0, yz=0;
 char initfns[MAX][MAX], fns[MAX][MAX][MAX];
 
-void menu(int value){           // called when menu is opened on right click
+void menu( int value ){           // called when menu is opened on right click
 
  switch( value ){
   case 1: usr=glo=0;            // unset glo & usr, sets local max/min
@@ -149,10 +149,10 @@
   bitmap( str, xmax+2, 1 );
 
   if( xz )
-   sprintf( str, "Y-coordinate=%d", yoffset+1);
+   sprintf( str, "N-S slice %d", yoffset+1);
   else{
    if( yz )
-    sprintf( str, "X-coordinate=%d", xoffset+1); 
+    sprintf( str, "E-W slice %d", xoffset+1); 
    else
     sprintf( str, "Level %d", ilev ); // labels current level 
   }
@@ -382,7 +382,7 @@
  FILE* fp;
  int i, j; 
   
- fp=fopen( "jet.dat", "r" );  // opens file containing values
+ fp=fopen( ".darwinview/jet.h", "r" );  // opens file containing values
  for( i=0; i<64; i++ )        // reads in 64 sets of r, g, b values
   for( j=0; j<3; j++ )
    fscanf( fp, "%f", &jet[i][j] );
@@ -470,25 +470,31 @@
  }
 }
 
-void black(){
+void black( ){
  glClear( GL_COLOR_BUFFER_BIT );
  glutSwapBuffers();
- glFlush(); 
+ glFlush();
 }
 
+
 int main( int argc, char *argv[] ){
  int i, setsx, setsy, tmpx, tmpy, winx, winy, parent;
- char filename[MAX];
+ char str[MAX], filename[MAX];
+ FILE* fp;
+
+ if( strcmp(argv[1], "binary") == 0 )
+  fp=fopen( ".darwinview/binconfig", "r" );
+ else
+  if( strcmp(argv[1],"netcdf") == 0 )
+   fp=fopen( ".darwinview/ncconfig", "r" );
 
- sscanf( argv[1], "%dx%d", &winx, &winy );  // reads screen resolution from command line
+ fscanf( fp, "%dx%d ", &winx, &winy ); 
  winy-=60;  winx-=20;                     // adjusts resolution so edges won't get cut off             
- 
- printf( "Please enter x, y and z dimensions.\n" );   
- scanf( "%d %d %d", &NX, &NY, &NZ );           // prompts user for NX, NY, NZ
- printf( "Please enter filename.\n" );
- scanf( "%s", filename );                         // prompts user for initial filenames 
- printf( "Please enter dimensions of data sets.\n" );
- scanf( "%dx%d", &setsx, &setsy );                 // prompts user for dimensions of subwindows
+ fscanf( fp, "%d %d %d ", &NX, &NY, &NZ );
+ fscanf( fp, "%dx%d ", &setsx, &setsy );                // prompts user for dimensions of subwindows
+ fscanf( fp, "%s", filename );
+
+ fclose( fp );
 
  xmax=NX; ymax=NY;