Changeset 2079 for branches/newmole/source/cpu.cpp

Timestamp:

05/17/08 09:51:43 (8 months ago)

Author:

rjrw

Message:

Merged from trunk r2022:2078

Files:

• branches/newmole/source/cpu.cpp (modified) (5 diffs)

branches/newmole/source/cpu.cpp

@@ -359 +359 @@
 
         /* >>chng 01 oct 09, disable gradual underflow on ultrasparc whith g++
-         * (only needed for versions prior to 3.1, see Note 1).
+         * (only needed for versions < 3.1 or >= 4.3.0, see Note 1).
          *
          * compile this module with:
-         *     g++ [ other options... ] -I<include-dir> -DHAVE_SUNMATH -c setfpenv.c
+         *     g++ [ other options... ] -I<include-dir> -DHAVE_SUNMATH -c cpu.cpp
          * link the program with:
          *     g++ -L<library-dir> -o cloudy.exe *.o -lsunmath
@@ -379 +379 @@
          * g++ [ other options... ] -funsafe-math-optimizations -c *.c
          * g++ [ other options... ] -funsafe-math-optimizations -o cloudy.exe *.o
+         *
+         * Starting with g++ 4.3.0 the -funsafe-math-optimizations option can no longer be
+         * used as it implicitly enables -fno-trapping-math, which is unsafe for Cloudy
+         * because we do trap floating point exceptions.
          *
          * Note 2: Don't use nonstandard_arithmetic() with CC (the SunWorks/Forte compiler);
@@ -439 +443 @@
         string FileName( fname );
         vector<string>::size_type begin, end;
-        bool lgAbort = ( scheme == AS_DATA_ONLY || scheme == AS_DATA_LOCAL ||
+        bool lgAbort = ( scheme == AS_DATA_ONLY || scheme == AS_DATA_OPTIONAL || scheme == AS_DATA_LOCAL ||
                          scheme == AS_LOCAL_DATA || scheme == AS_LOCAL_ONLY );
 
@@ -446 +450 @@
         case AS_DATA_ONLY:
         case AS_DATA_ONLY_TRY:
+        case AS_DATA_OPTIONAL:
                 begin = 1;
                 end = cpu.chSearchPath.size()-1;
@@ -480 +485 @@
         if( handle == NULL && lgAbort )
         {
-                // failed on very first open -> probably path is not correct
-                fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname );
-                fprintf( ioQQQ, "Although there may be other reasons you have received this error,\n");
-                fprintf( ioQQQ, "the most likely are that the path has not been properly set\n");
-                fprintf( ioQQQ, "or that the path points to an old version of the data.\n\n");
-                fprintf( ioQQQ, "Please have a look at the file path.h in the source directory\n");
-                fprintf( ioQQQ, "to check how the variable CLOUDY_DATA_PATH is set - \n");
-                fprintf( ioQQQ, "it should give the location of the data files I need.\n");
-                fprintf( ioQQQ, "These are the files in the data download from the web site.\n\n");
-                fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n");
-                fprintf( ioQQQ, "or use the shell command \"set CLOUDY_DATA_PATH=path\" to set the\n");
-                fprintf( ioQQQ, "path from a command prompt.\n\n");
-                cpu.printDataPath();
-
-                fprintf( ioQQQ, " These are all the paths I tried:\n" );
-                for( vector<string>::size_type i=begin; i < end; ++i )
-                {
-                        if( cpu.chSearchPath[i].length() > 0 )
-                                fprintf( ioQQQ, "   ==%s==\n", cpu.chSearchPath[i].c_str() );
-                        else
-                                fprintf( ioQQQ, "   ==<local directory>==\n" );
+                if( scheme == AS_DATA_OPTIONAL )
+                        // presence is optional -> make warning less scary...
+                        fprintf( ioQQQ, "\nI could not open the data file %s\n\n", fname );
+                else
+                        fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname );
+                if( cpu.nFileDone == 0 || scheme == AS_DATA_ONLY )
+                {
+                        // failed on very first open -> most likely path is not correct
+                        // failed on AS_DATA_ONLY -> CLOUDY_DATA_PATH may point to obsolete data dir
+                        fprintf( ioQQQ, "Although there may be other reasons you have received this error,\n");
+                        fprintf( ioQQQ, "the most likely are that the path has not been properly set\n");
+                        fprintf( ioQQQ, "or that the path points to an old version of the data.\n\n");
+                        fprintf( ioQQQ, "Please have a look at the file path.h in the source directory\n");
+                        fprintf( ioQQQ, "to check how the variable CLOUDY_DATA_PATH is set - \n");
+                        fprintf( ioQQQ, "it should give the location of the data files I need.\n");
+                        fprintf( ioQQQ, "These are the files in the data download from the web site.\n\n");
+                        fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n");
+                        fprintf( ioQQQ, "or use the shell command \"export CLOUDY_DATA_PATH=path\" to set the\n");
+                        fprintf( ioQQQ, "path from a bash command prompt.\n\n");
+                        cpu.printDataPath();
+                }
+                else
+                {
+                        // failed on search including local directory -> most likely the file name
+                        // was mistyped on a compile command, or Cloudy is run in the wrong directory
+                        // if scheme == AS_DATA_OPTIONAL, this most likely is a stellar grid that is not installed.
+                        fprintf( ioQQQ, "These are all the paths I tried:\n" );
+                        for( vector<string>::size_type i=begin; i < end; ++i )
+                        {
+                                if( cpu.chSearchPath[i].length() > 0 )
+                                        fprintf( ioQQQ, "   ==%s==\n", cpu.chSearchPath[i].c_str() );
+                                else
+                                        fprintf( ioQQQ, "   ==<local directory>==\n" );
+                        }
+                        // AS_DATA_OPTIONAL files should provide their own message (currently only stellar grids)
+                        if( scheme != AS_DATA_OPTIONAL )
+                        {
+                                fprintf( ioQQQ, "\nAlthough there may be other reasons you have received this error,\n");
+                                fprintf( ioQQQ, "the most likely are that you mistyped the file name, or that you\n");
+                                fprintf( ioQQQ, "are running Cloudy in the wrong directory. If you are running a\n");
+                                fprintf( ioQQQ, "COMPILE command, this needs to be done in the data directory.\n\n");
+                                fprintf( ioQQQ, "Otherwise, please have a look at the file path.h in the source\n");
+                                fprintf( ioQQQ, "directory to check how the variable CLOUDY_DATA_PATH is set - \n");
+                                fprintf( ioQQQ, "it should give the location of the data files I need.\n");
+                                fprintf( ioQQQ, "These are the files in the data download from the web site.\n\n");
+                                fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n");
+                                fprintf( ioQQQ, "or use the shell command \"export CLOUDY_DATA_PATH=path\" to set the\n");
+                                fprintf( ioQQQ, "path from a bash command prompt.\n\n");
+                        }
                 }
                 fprintf(ioQQQ, "Sorry.\n\n\n");