Changeset 119 for trunk/tsuite/programs/mpi/mpi.c

Timestamp:

12/25/05 12:19:02 (3 years ago)

Author:

gary

Message:

cleaning up programs

Files:

• trunk/tsuite/programs/mpi/mpi.c (modified) (4 diffs)

trunk/tsuite/programs/mpi/mpi.c

@@ -1 +1 @@
 /*main program to call cloudy to generate a large loc data cube */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <math.h>
-#include <assert.h>
+#include "cddefines.h"
+#include "cddrive.h"
 
 /* This flag indicates where we are multi-processing.\
@@ -16 +13 @@
 /*lint -e506  constant value Boolean */
 
-#include "cddrive.h"
 
 #ifdef _MSC_VER
@@ -447 +443 @@
                                 n = cdRead( "iterate convergence "  );/**/
 #                       else 
-                                sprintf(chLine,"iterate %li", ITERATIONS);
+                                sprintf(chLine,"iterate %i", ITERATIONS);
                                 n = cdRead( chLine  );
 #                       endif
@@ -630 +626 @@
                                 if( (lgOK=cdLine( "Fe2b", FeII_Bands[n][0] , &relative , &absolute ))<=0 )
                                 {
-                                        fprintf(stderr,"did not find %s %.1f %li\n","Fe2b",FeII_Bands[n][0],lgOK);
-                                        fprintf(ioDATA,"did not find %s %.1f %li\n","Fe2b",FeII_Bands[n][0],lgOK);
+                                        fprintf(stderr,"did not find %s %.1f %i\n","Fe2b",FeII_Bands[n][0],lgOK);
+                                        fprintf(ioDATA,"did not find %s %.1f %i\n","Fe2b",FeII_Bands[n][0],lgOK);
                                 }
                                 grid.pred[n+nLines] = log10(MAX2(1e-30,relative) );