Index: palm/trunk/SCRIPTS/.mrun.config.forwind
===================================================================
--- palm/trunk/SCRIPTS/.mrun.config.forwind	(revision 1098)
+++ palm/trunk/SCRIPTS/.mrun.config.forwind	(revision 1099)
@@ -5,11 +5,13 @@
 %mainprog          palm.f90
 %base_directory    $HOME/palm/current_version
-%base_data         $base_directory/JOBS
-%output_data       /data/work/fw/<replace by your username>/palm/current_version/JOBS
-# Replace <replace by your username> by your username on FLOW. Replace "/fw/" by "/iwes/" if
-# your user directory resides in /iwes/.
+%base_data         ~/palm/current_version/jobs
+################################################################################
+# Replace <<REPLACE BY YOUR USERNAME> by your username on FLOW. Replace "/fw/" 
+# by "/iwes/" if your user directory resides in /iwes/.
+################################################################################
+%output_data       /data/work/fw/<REPLACE BY YOUR USERNAME>/palm/current_version/JOBS
 %source_path       $base_directory/trunk/SOURCE
-%add_source_path   $base_directory/USER_CODE/$fname
-%depository_path   $base_directory/MAKE_DEPOSITORY
+%add_source_path   $base_directory/user_code/$fname
+%depository_path   $base_directory/make_depository
 %use_makefile      true
 #
@@ -19,25 +21,60 @@
 %host_identifier       cfdh*            lcflow
 %host_identifier       cfdx*            lcflow
-#
+
+################################################################################
+# Replace <YOUR_DESKTOP_HOSTNAME> by the hostname of your desktop
+# an uncomment following line to enable job submission from you local desktop
+################################################################################
+#%host_identifier       <YOUR_DESKTOP_HOSTNAME>           lcfor
+
+################################################################################
+# Configuration for Ubuntu Linux 12.04 LTS with gcc (4.6.3) and OpenMPI (1.4.3)
 #
 # The next block contains all informations for compiling the PALM code
-# and for generating and running the PALM executable using MPI. Replace <user-id>
+# and for generating and running the PALM executable using MPI on a Linux machine 
+# with gcc and OpenMPI. Replace <LOCAL_USERNAME> with your username on your
+# local machine
+#
+# NOTE: - Other hosts may require different settings.
+#       - following packages are required:
+#         openmpi-common, libopenmpi-dev, libopenmpi, libnetcdf, libnetcdf-dev,
+#         gcc
+#
+################################################################################
+%remote_username   <LOCAL_USERNAME>                                          lcfor parallel
+%tmp_user_catalog  /tmp                                                      lcfor parallel
+%tmp_data_catalog  /tmp                                                      lcfor parallel
+%compiler_name     mpif90                                                    lcfor parallel
+%compiler_name_ser gfortran                                                  lcfor parallel
+%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__netcdf4:-D__parallel  lcfor parallel
+%netcdf_inc        -I/opt/netcdf/4.2.1.1/include                             lcfor parallel
+%netcdf_lib        -lnetcdff:-lnetcdf                                        lcfor parallel
+%mopts             -j:4                                                      lcfor parallel
+%fopts             -Ofast:-IPA:-mtune=native:-march=native:-cpp:-fdefault-real-8:-fbackslash:-fconvert=little-endian   lcfor parallel
+%lopts             -Ofast:-IPA:-mtune=native:-march=native:-cpp:-fdefault-real-8:-fbackslash                           lcfor parallel
+
+################################################################################
+# Configuration for FLOW
+#
+# The next block contains all informations for compiling the PALM code
+# and for generating and running the PALM executable using MPI. Replace <USERNAME_FLOW>
 # with your username on FLOW and if necessary "/fw/" by "/iwes/".
 # The following 'lcflow parallel' block assumes PALM compilation and execution
 # on host flow. Please note that other hosts may require different settings.
-#
-%remote_username   <replace by your username>                                      lcflow parallel
-%tmp_user_catalog  /data/work/fw/<replace by your username>/tmp                    lcflow parallel
-%tmp_data_catalog  /data/work/fw/<replace by your username>/palm_restart_data      lcflow parallel
-%compiler_name     mpiifort                                                        lcflow parallel
-%compiler_name_ser ifort                                                           lcflow parallel
-%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__lc:-D__parallel     lcflow parallel
-%netcdf_inc        -I$$NETCDFF_INCLUDE                                             lcflow parallel
-%netcdf_lib        -L$$NETCDFF_DIR:-lnetcdff:-L$$NETCDF_DIR:-lnetcdf               lcflow parallel
-%mopts             -j:4                                                            lcflow parallel
-%fopts             -xSSE4.2:-O3:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-ip:-nbs:-convert:little_endian                lcflow parallel
-%lopts             -xSSE4.2:-O3:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-ip:-nbs:-limf:-lm:-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/4.2.1.1/intel/64/2011.0.013:netcdf-fortran/4.2/intel/64/2011.0.013:intel/ics/64/2011.0.013:intel/impi/4.0.1.007/64:hdf5/1.8.9/intel/64/2011.0.013:qt4/4.8.2  lcflow parallel 
+################################################################################
+%remote_username   <USERNAME_FLOW>                                                                                               lcflow parallel
+%tmp_user_catalog  /data/work/fw/$remote_username/tmp                                                                            lcflow parallel
+%tmp_data_catalog  /data/work/fw/$remote_username/palm_restart_data                                                              lcflow parallel
+%compiler_name     mpiifort                                                                                                      lcflow parallel
+%compiler_name_ser ifort                                                                                                         lcflow parallel
+%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__netcdf4:-D__parallel  lcflow parallel
+%netcdf_inc        -I/cm/shared/apps/netcdf-fortran/4.2/intel/64/2011.0.013/include                                              lcflow parallel
+%netcdf_lib        -L/cm/shared/apps/netcdf-fortran/4.2/intel/64/2011.0.013/lib:-lnetcdff:-L/cm/shared/apps/netcdf/4.2.1.1/intel/64/2011.0.013/lib:-lnetcdf:-L/cm/shared/apps/hdf5/1.8.9/intel/64/2011.0.013/lib:-Wl,-rpath:/cm/shared/apps/hdf5/1.8.9/intel/64/2011.0.013/lib:-Wl,-rpath:/cm/shared/apps/netcdf/4.2.1.1/intel/64/2011.0.013/lib:-Wl,-rpath:/cm/shared/apps/netcdf-fortran/4.2/intel/64/2011.0.013/lib       lcflow parallel
+%mopts             -j:8                                                                                                          lcflow parallel
+%fopts             -xhost:-O3:-fpp:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-sqrt:-ip:-nbs:-convert:little_endian:-static-intel   lcflow parallel
+%lopts             -xhost:-O3:-fpp:-r8:-align:all:-ftz:-fno-alias:-no-scalar-rep:-no-prec-sqrt:-ip:-nbs:-static-intel:-Wl,-rpath:/cm/shared/apps/intel/ics-2011.0.013/composerxe-2011.0.084/compiler/lib/intel64          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           sge/6.2u5p2:netcdf/4.2.1.1/intel/64/2011.0.013:netcdf-fortran/4.2/intel/64/2011.0.013:intel/ics/64/2011.0.013:intel/impi/64/4.0.1.007:hdf5/1.8.9/intel/64/2011.0.013:qt4     lcflow parallel 
+%disc_space        50                                                                                                            lcflow parallel 
 #
 #
