Changeset 1085 for palm/trunk

Timestamp:

Jan 4, 2013 11:19:12 AM (12 years ago)

Author:

maronga

Message:

-cpp directive moved to %cpp_options in some .mrun.config files

Location:

palm/trunk/SCRIPTS

Files:

• .mrun.config.default (modified) (1 diff)
• .mrun.config.forwind (modified) (1 diff)
• .mrun.config.yonsei2011 (modified) (1 diff)

palm/trunk/SCRIPTS/.mrun.config.default

@@ -32 +32 @@
 %compiler_name     mpif90                                        <hi> parallel
 %compiler_name_ser ifort                                         <hi> parallel
-%cpp_options       -D__mpi2:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   <hi> parallel
+%cpp_options       -cpp:-D__mpi2:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   <hi> parallel
 %netcdf_inc        -I:<replace by netcdf include path>           <hi> parallel
 %netcdf_lib        -L<replace by netcdf library path>:-lnetcdf   <hi> parallel
 %mopts             -j:4                                          <hi> parallel
-%fopts             -xS:-cpp:-r8:-nbs:-convert:little_endian:-I:<replace by mpi include path>   <hi> parallel
-%lopts             -xS:-cpp:-r8:-nbs:-Vaxlib:-L:<replace by mpi library path>                  <hi> parallel
+%fopts             -xS:-r8:-nbs:-convert:little_endian:-I:<replace by mpi include path>   <hi> parallel
+%lopts             -xS:-r8:-nbs:-Vaxlib:-L:<replace by mpi library path>                  <hi> parallel
 # if you want to use your own hostfile, uncomment next line
 #%hostfile          $base_directory/.hostfile                    <hi> parallel

palm/trunk/SCRIPTS/.mrun.config.forwind

@@ -31 +31 @@
 %compiler_name     mpiifort                                                        lcflow parallel
 %compiler_name_ser ifort                                                           lcflow parallel
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__lc:-D__parallel  lcflow parallel
+%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__lc:-D__parallel  lcflow parallel
 %netcdf_inc        -I:/cm/shared/apps/netcdf/intel/64/4.1.3/include                 lcflow parallel
 %netcdf_lib        -L/cm/shared/apps/netcdf/intel/64/4.1.3/lib:-lnetcdf:-lnetcdff   lcflow parallel
 %mopts             -j:4
-%fopts             -xSSE4.2:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian   lcflow parallel
-%lopts             -xSSE4.2:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib                  lcflow parallel
+%fopts             -xSSE4.2:-O3:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian   lcflow parallel
+%lopts             -xSSE4.2:-O3:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib                  lcflow parallel
 %login_init_cmd    .:/cm/local/apps/environment-modules/3.2.6/Modules/3.2.6/init/bash\;:MODULEPATH=/cm/shared/modulefiles/                      lcflow parallel
 %modules           netcdf/intel:intel/ics:intel/impi:hdf5/intel                                                                                 lcflow parallel 

palm/trunk/SCRIPTS/.mrun.config.yonsei2011

@@ -22 +22 @@
 %compiler_name     mpif90                                        lcyon parallel
 %compiler_name_ser ifort                                         lcyon parallel
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   lcyon parallel
+%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf   lcyon parallel
 %netcdf_inc        -I:/usr/local/netcdf/363_intel11/include      lcyon parallel
 %netcdf_lib        -L/usr/local/netcdf/363_intel11/lib:-lnetcdf        lcyon parallel
 %mopts             -j:4                                          lcyon parallel
-%fopts             -fpe0:-axW:-O3:-cpp:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-I:/usr/local/mpich2/intel11/include     lcyon parallel
-%lopts             -fpe0:-axW:-O3:-cpp:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-L:/usr/local/mpich2/intel11/lib                    lcyon parallel
+%fopts             -fpe0:-axW:-O3:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-I:/usr/local/mpich2/intel11/include     lcyon parallel
+%lopts             -fpe0:-axW:-O3:-r8:-fp-model:precise:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib:-L:/usr/local/mpich2/intel11/lib                    lcyon parallel
 %memory            2000                                          lcyon parallel
 #