r91: Made ImageFile inherit from Array2dFile

[ctsim.git] / src / phm2if.cpp

diff --git a/src/phm2if.cpp b/src/phm2if.cpp
index 66ceb470c4a3af84386d79e66f9069af0d51627a..63d5a49b7a38ce2987cddd707fe0f78aab929c9f 100644 (file)
--- a/src/phm2if.cpp
+++ b/src/phm2if.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: phm2if.cpp,v 1.6 2000/06/09 01:35:33 kevin Exp $
+**  $Id: phm2if.cpp,v 1.7 2000/06/09 11:03:08 kevin Exp $
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -317,12 +317,12 @@ phm2sdf_main (int argc, char* argv[])
 
   if (mpiWorld.getRank() == 0) {
     im_global = new ImageFile (opt_outfile, opt_nx, opt_ny);
-    im_global->adf.fileCreate();
+    im_global->fileCreate();
   }
   im_local = new ImageFile (opt_nx, opt_ny);
 #else
   im_global = new ImageFile (opt_outfile, opt_nx, opt_ny);
-  im_global->adf.fileCreate ();
+  im_global->fileCreate ();
 #endif
 
   if (opt_phmnum >= 0)
@@ -395,10 +395,10 @@ phm2sdf_main (int argc, char* argv[])
   if (mpiWorld.getRank() == 0) 
 #endif
   {
-    im_global->adf.arrayDataWrite ();
+    im_global->arrayDataWrite ();
     calctime = time_end - time_start;
-    im_global->adf.labelAdd (Array2dFileLabel::L_HISTORY, opt_desc, calctime);
-    im_global->adf.fileClose ();
+    im_global->labelAdd (Array2dFileLabel::L_HISTORY, opt_desc, calctime);
+    im_global->fileClose ();
     if (opt_verbose)
       fprintf (stdout, "Time to compile image = %.2f sec\n\n", calctime);