.map -> .log

.gitignore

@@ -36,8 +36,8 @@
 *_Jacobian*
 *_JacobianSP*
 *_LinearAlgebra*
+*.log
 *_Main*
-*.map
 *_mex_Fun*
 *_mex_Hessian*
 *_mex_Jac_SP*

docs/source/getting_started/02_running_kpp_sample_mech.rst

@@ -325,7 +325,7 @@ to:
 KPP creates Fortran90 beginning with the mechanism name (which is
 :file:`ROOT_` = :file:`small_strato_` in this example). KPP also
 generates a human-readable summary of the mechanism
-(:file:`small_strato.map`) as well as the Makefile
+(:file:`small_strato.log`) as well as the Makefile
 :file:`Makefile_small_strato` that can be used to build the executable.
 
 .. _example_step_4:
@@ -409,7 +409,7 @@ files generated by the Fortran compiler, type:
    $ make -f Makefile_small_strato clean
 
 If you also wish to remove all the files that were generated by KPP
-(i.e. :file:`small_strato.map` and :file:`small_strato_*.f90`), type:
+(i.e. :file:`small_strato.log` and :file:`small_strato_*.f90`), type:
 
 .. code-block:: console
 

docs/source/using_kpp/05_output_from_kpp.rst

@@ -1072,13 +1072,13 @@ However, if no driver was selected (i.e. :command:`#DRIVER none`), it is
 necessary to add the name of the main program file manually to the
 Makefile.
 
-.. _Map:
+.. _Log:
 
 ============
-The map file
+The log file
 ============
 
-The map file :file:`ROOT.map` contains a summary of all the functions,
+The log file :file:`ROOT.log` contains a summary of all the functions,
 subroutines and data structures defined in the code file, plus a
 summary of the numbering and category of the species involved.
 

src/code.c

@@ -97,7 +97,7 @@ FILE * sparse_stoicmFile = 0;
 FILE * stochasticFile = 0;
 FILE * global_dataFile = 0;
 FILE * hessianFile = 0;
-FILE * mapFile = 0;
+FILE * logFile = 0;
 FILE * makeFile = 0;
 FILE * monitorFile = 0;
 FILE * mex_funFile = 0;
@@ -393,11 +393,11 @@ char *FUNCALL[] = { "FUN_SPLIT( Y, FIX, RCONST, Ydot, P, D )", /* index 0 = spli
   system( cmd );
 }
 
-void MapFunctionComment( int f, int *vars )
+void LogFunctionComment( int f, int *vars )
 {
 FILE *oldf;
 
-  oldf = UseFile( mapFile );
+  oldf = UseFile( logFile );
   FunctionStart( f, vars );
   FlushBuf();
   UseFile( oldf );

src/code.h

@@ -69,7 +69,7 @@ extern FILE * hessianFile;
 extern FILE * integratorFile;
 extern FILE * jacobianFile;
 extern FILE * linalgFile;
-extern FILE * mapFile;
+extern FILE * logFile;
 extern FILE * makeFile;
 extern FILE * monitorFile;
 extern FILE * mex_funFile;
@@ -121,7 +121,7 @@ void F90_Inline( char *fmt, ... );
 void MATLAB_Inline( char *fmt, ... );
 void IncludeFile( char * fname );
 void IncludeCode( char *fmt, ... );
-void MapFunctionComment( int f, int *vars );
+void LogFunctionComment( int f, int *vars );
 
 // Added attr argument to the function prototype for DefineVariable
 //   -- Bob Yantosca (25 Apr 2002)

src/code_c.c

@@ -487,7 +487,7 @@ int narg;
 
   FlushBuf();
 
-  MapFunctionComment( f, vars );
+  LogFunctionComment( f, vars );
 }
 
 void C_FunctionEnd( int f )
@@ -566,8 +566,8 @@ void Use_C()
      OpenFile( &sparse_hessFile, rootFileName, "_HessianSP.c",
          "Sparse Hessian Data Structures File" );
   }
-  OpenFile( &mapFile, rootFileName, ".map",
-                   "Map File with Human-Readable Information" );
+  OpenFile( &logFile, rootFileName, ".log",
+                   "Log File with Human-Readable Information" );
   OpenFile( &monitorFile, rootFileName, "_Monitor.c",
                    "Utility Data Initialization" );
 }

src/code_f77.c

@@ -505,7 +505,7 @@ int narg;
   bprintf("\n");
   FlushBuf();
 
-  MapFunctionComment( f, vars );
+  LogFunctionComment( f, vars );
 }
 
 /*************************************************************************************************/
@@ -589,8 +589,8 @@ void Use_F()
      OpenFile( &sparse_hessFile, rootFileName, "_HessianSP.f",
          "Sparse Hessian Data Structures File" );
   }     
-  OpenFile( &mapFile, rootFileName, ".map", 
-                   "Map File with Human-Readable Information" );
+  OpenFile( &logFile, rootFileName, ".log", 
+                   "Log File with Human-Readable Information" );
   OpenFile( &monitorFile, rootFileName, "_Monitor.f", 
                    "Initialization of Utility Data Structures" );
 } 

src/code_f90.c

@@ -719,7 +719,7 @@ int narg;
   bprintf("\n");
   FlushBuf();
 
-  MapFunctionComment( f, vars );
+  LogFunctionComment( f, vars );
 }
 
 /*************************************************************************************************/
@@ -852,9 +852,9 @@ void Use_F90()
 	      "Sparse Hessian Data Structures File" );
   }
 
-  // .map
-  OpenFile( &mapFile, rootFileName, ".map",
-	    "Map File with Human-Readable Information" );
+  // .log
+  OpenFile( &logFile, rootFileName, ".log",
+	    "Log File with Human-Readable Information" );
 
   // _Monitor
   sprintf( buf, "_Monitor.%s", f90Suffix );

src/code_matlab.c

@@ -625,7 +625,7 @@ time_t t;
 
   FlushBuf();
 
-  MapFunctionComment( f, vars );
+  LogFunctionComment( f, vars );
 }
 
 /*************************************************************************************************/
@@ -700,8 +700,8 @@ void Use_MATLAB()
      OpenFile( &sparse_hessFile, rootFileName, "_HessianSP.m",
          "Sparse Hessian Data Structures File" );
   }     
-  OpenFile( &mapFile, rootFileName, ".map", 
-                   "Map File with Human-Readable Information" );
+  OpenFile( &logFile, rootFileName, ".log", 
+                   "Log File with Human-Readable Information" );
   OpenFile( &monitorFile, rootFileName, "_Monitor.m", 
                    "Utility Data Definition File" );
 } 

src/gen.c

@@ -2749,11 +2749,11 @@ char lhsbuf[MAX_EQNLEN], rhsbuf[MAX_EQNLEN];
 
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
-void GenerateMap()
+void GenerateLog()
 {
 int i, dn;
 
-  UseFile( mapFile );
+  UseFile( logFile );
 
   WriteAll("### Options -------------------------------------------\n");
   NewLines(1);
@@ -3499,7 +3499,7 @@ int n;
   if ( useLang == F90_LANG )
       GenerateF90Modules('h');
 
-  GenerateMap();
+  GenerateLog();
 
   printf("\nKPP is generating the monitor data:");
   printf("\n    - %s_Monitor",rootFileName);
@@ -3632,7 +3632,7 @@ int n;
   if( integratorFile )    fclose( integratorFile );
   if( jacobianFile )      fclose( jacobianFile );
   if( linalgFile )        fclose( linalgFile );
-  if( mapFile )           fclose( mapFile );
+  if( logFile )           fclose( logFile );
   if( makeFile )          fclose( makeFile );
   if( monitorFile )       fclose( monitorFile );
   if( mex_funFile )       fclose( mex_funFile );

util/Makefile_c

@@ -54,7 +54,7 @@ clean:
 
 distclean:
 	rm -f $(SPOBJ) $(OBJ) KPP_ROOT.exe KPP_ROOT*.dat \
-	KPP_ROOT_*.c KPP_ROOT_*.h KPP_ROOT*.map KPP_ROOT_*.mexglx
+	KPP_ROOT_*.c KPP_ROOT_*.h KPP_ROOT*.log KPP_ROOT_*.mexglx
 
 KPP_ROOT_Monitor.o: KPP_ROOT_Monitor.c $(HEADERS)
 	$(CC) $(COPT) -c $<

util/Makefile_f

@@ -58,11 +58,11 @@ mex:    $(HEADERS) $(SPOBJ) $(OBJ)
 	$(MEX) FC#$(FC) -fortran -O KPP_ROOT_mex_Hessian.f $(SPOBJ) $(OBJ)
 
 clean:
-	rm -f $(SPOBJ) $(OBJ) KPP_ROOT.exe KPP_ROOT.map  \
+	rm -f $(SPOBJ) $(OBJ) KPP_ROOT.exe KPP_ROOT.log  \
 	KPP_ROOT.dat 
 
 distclean:
-	rm -f $(SPOBJ) $(OBJ) KPP_ROOT.exe KPP_ROOT.map  \
+	rm -f $(SPOBJ) $(OBJ) KPP_ROOT.exe KPP_ROOT.log  \
 	KPP_ROOT.dat KPP_ROOT*.f  KPP_ROOT*.h 
 
 KPP_ROOT_Monitor.o: KPP_ROOT_Monitor.f $(HEADERS)

util/Makefile_f90

@@ -182,11 +182,11 @@ mex:    $(ALLOBJ)
 clean:
 	rm -f *.o *.mod \
 	KPP_ROOT*.dat KPP_ROOT.exe KPP_ROOT*.mexglx \
-	KPP_ROOT.map
+	KPP_ROOT.log
 
 distclean:
 	rm -f *.o *.mod \
-	KPP_ROOT*.dat KPP_ROOT.exe KPP_ROOT.map \
+	KPP_ROOT*.dat KPP_ROOT.exe KPP_ROOT.log \
 	KPP_ROOT_*.f90 KPP_ROOT_*.f90 KPP_ROOT_*.mexglx \
 	results*.m
 

util/Makefile_upper_F90

@@ -187,11 +187,11 @@ mex:    $(ALLOBJ)
 clean:
 	rm -f *.o *.mod \
 	KPP_ROOT*.dat KPP_ROOT.exe KPP_ROOT*.mexglx \
-	KPP_ROOT.map
+	KPP_ROOT.log
 
 distclean:
 	rm -f *.o *.mod \
-	KPP_ROOT*.dat KPP_ROOT*.exe KPP_ROOT.map \
+	KPP_ROOT*.dat KPP_ROOT*.exe KPP_ROOT.log \
 	KPP_ROOT_*.f90 KPP_ROOT_*.F90 KPP_ROOT_*.mexglx \
 	results*.m