- The reading of ASCII grid input files that was broken in previous revisions has been fixed.

- Flushing the output explicitly.

code/branches/multi-gpu/EasyWave.cu

@@ -135,6 +135,8 @@ int main( int argc, char **argv )
       }
     }
 
+    fflush(stdout); 
+
     if( Par.outDump ) {
       if( (elapsed-lastDump) >= Par.outDump ) {
     	Node.copyIntermediate();

code/branches/multi-gpu/ewGrid.cpp

@@ -99,6 +99,8 @@ int ewLoadBathymetry()
   Dx = Re * g2r( DLon );     // in m along the equator
   Dy = Re * g2r( DLat );
 
+  if( isBin ) {
+
 	  /* NOTE: optimal would be reading everything in one step, but that does not work because rows and columns are transposed
 	     * (only possible with binary data at all) - use temporary buffer for now (consumes additional memory!) */
 	  float *buf = new float[ NLat*NLon ];
@@ -112,8 +114,6 @@ int ewLoadBathymetry()
 		  if( isBin )
 			fval = buf[ (j-1) * NLon + (i-1) ];
 			//ierr = fread( &fval, sizeof(float), 1, fp );
-      else
-        ierr = fscanf( fp, " %f ", &fval );
 
 		  Node(m, iTopo) = fval;
 		  Node(m, iTime) = -1;
@@ -130,6 +130,29 @@ int ewLoadBathymetry()
 
 	  delete[] buf;
 
+  } else {
+
+	  for( j=1; j<=NLat; j++ ) {
+  		for( i=1; i<=NLon; i++ ) {
+
+			m = idx(j,i);
+			ierr = fscanf( fp, " %f ", &fval );
+
+			Node(m, iTopo) = fval;
+			Node(m, iTime) = -1;
+			Node(m, iD) = -fval;
+
+			if( Node(m, iD) < 0 ) {
+			Node(m, iD) = 0.0f;
+			} else if( Node(m, iD) < Par.dmin ) {
+			  Node(m, iD) = Par.dmin;
+			}
+
+		}
+
+	  }
+  }
+
   for( k=1; k<MAX_VARS_PER_NODE-2; k++ ) {
 	  Node.initMemory( k, 0 );
   }