Changeset 1970

Show
Ignore:
Timestamp:
04/26/08 18:05:12 (2 weeks ago)
Author:
gary
Message:

small changes in printout - no changes in functionality

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/source/assert_results.cpp

    r1968 r1970  
    19211921                        int iCase = 1; 
    19221922                        RelError[i] = 0.; 
    1923                         fprintf(ioQQQ,"        Species  nHi nLo  Wl  Computed  Asserted       error\n"); 
    19241923                        long nHighestPrinted = StatesElem[nISOCaseB][nelemCaseB][iso.numPrintLevels[nISOCaseB][nelemCaseB]-1].n; 
    19251924                        if( nISOCaseB == ipH_LIKE ) 
    19261925                        { 
     1926                                fprintf(ioQQQ,"        Species  nHi nLo  Wl  Computed  Asserted       error\n"); 
    19271927                                /* limit of 10 is because that is all we printed and saved in prt_lines_hydro */ 
    19281928                                for( long int ipLo=1+iCase; ipLo< MIN2(10,nHighestPrinted-1); ++ipLo ) 
    …… 
    19781978                                4026.f, 6678.f, 4922.f }; 
    19791979                                /* do He I as special case */ 
     1980                                fprintf(ioQQQ,"        Species   Wl  Computed  Asserted       error\n"); 
    19801981                                for( long int ipLine=0; ipLine< N_CASEB_HEI ; ++ipLine ) 
    19811982                                { 
    …… 
    26522653                if( assertresults.nSumErrorCaseAssert>0 ) 
    26532654                { 
    2654                         fprintf(ioQQQ,"\n The sum of the %li Case A and B assert relative " 
    2655                                 "residuals add up to %.2f\n\n" ,  
     2655                        fprintf(ioQQQ,"\n The mean of the %li assert Case A, B relative " 
     2656                                "residuals is %.2f\n\n" ,  
    26562657                                assertresults.nSumErrorCaseAssert, 
    26572658                                assertresults.SumErrorCaseAssert /assertresults.nSumErrorCaseAssert ); 

  • trunk/source/cpu.cpp

    r1960 r1970  
    480480        if( handle == NULL && lgAbort ) 
    481481        { 
    482                 if( cpu.nFileDone == 0 ) 
    483                 { 
    484                         // failed on very first open -> probably path is not correct 
    485                         fprintf( ioQQQ, "I Could not open the file %s\n", fname ); 
    486                         fprintf( ioQQQ, "\n\nAlthough there may be other reasons you have received this error,\n"); 
    487                         fprintf( ioQQQ, "the most likely reason is that the path has not been properly set.\n"); 
    488                         fprintf( ioQQQ, "Please have a look at the file path.h in the source directory.\n"); 
    489                         fprintf( ioQQQ, "Check how the variable CLOUDY_DATA_PATH is set - "); 
    490                         fprintf( ioQQQ, "it should give the location of the data files I need.\n"); 
    491                         fprintf( ioQQQ, "These are the files in the data download from the web site.\n"); 
    492                         fprintf( ioQQQ, "I bet that the path has not been set properly - "); 
    493                         fprintf( ioQQQ, "I could not find what I expected to find.\n"); 
    494                         cpu.printDataPath(); 
    495                         fprintf(ioQQQ, "Sorry.\n\n\n"); 
    496                 } 
    497                 else 
    498                 { 
    499                         fprintf( ioQQQ, " I Could not open the file %s on any of these paths:\n", fname ); 
    500                         for( vector<string>::size_type i=begin; i < end; ++i ) 
    501                         { 
    502                                 if( cpu.chSearchPath[i].length() > 0 ) 
    503                                         fprintf( ioQQQ, "   ==%s==\n", cpu.chSearchPath[i].c_str() ); 
    504                                 else 
    505                                         fprintf( ioQQQ, "   ==<local directory>==\n" ); 
    506                         } 
    507                 } 
     482                // failed on very first open -> probably path is not correct 
     483                fprintf( ioQQQ, "\nPROBLEM DISASTER I could not open the data file %s\n\n", fname ); 
     484                fprintf( ioQQQ, "Although there may be other reasons you have received this error,\n"); 
     485                fprintf( ioQQQ, "the most likely are that the path has not been properly set\n"); 
     486                fprintf( ioQQQ, "or that the path points to an old version of the data.\n\n"); 
     487                fprintf( ioQQQ, "Please have a look at the file path.h in the source directory\n"); 
     488                fprintf( ioQQQ, "to check how the variable CLOUDY_DATA_PATH is set - \n"); 
     489                fprintf( ioQQQ, "it should give the location of the data files I need.\n"); 
     490                fprintf( ioQQQ, "These are the files in the data download from the web site.\n\n"); 
     491                fprintf( ioQQQ, "Recompile the code with the correct data path set in path.h\n"); 
     492                fprintf( ioQQQ, "or use the shell command \"set CLOUDY_DATA_PATH=path\" to set the\n"); 
     493                fprintf( ioQQQ, "path from a command prompt.\n\n"); 
     494                cpu.printDataPath(); 
     495 
     496                fprintf( ioQQQ, " These are all the paths I tried:\n", fname ); 
     497                for( vector<string>::size_type i=begin; i < end; ++i ) 
     498                { 
     499                        if( cpu.chSearchPath[i].length() > 0 ) 
     500                                fprintf( ioQQQ, "   ==%s==\n", cpu.chSearchPath[i].c_str() ); 
     501                        else 
     502                                fprintf( ioQQQ, "   ==<local directory>==\n" ); 
     503                } 
     504                fprintf(ioQQQ, "Sorry.\n\n\n"); 
    508505                cdEXIT(EXIT_FAILURE); 
    509506        }