Index: palm/trunk/SCRIPTS/.mrun.config.forwind_hlrnIII
===================================================================
--- palm/trunk/SCRIPTS/.mrun.config.forwind_hlrnIII	(revision 1959)
+++ palm/trunk/SCRIPTS/.mrun.config.forwind_hlrnIII	(revision 2034)
@@ -60,9 +60,10 @@
 %cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayh parallel
 %mopts               -j:4                                                              lccrayh parallel
-%fopts               -em:-O3:-hnoomp:-hfp3:-hdynamic                                   lccrayh parallel
-%lopts               -em:-O3:-hnoomp:-hfp3:-hdynamic:-dynamic                          lccrayh parallel
+%fopts               -em:-K:trap=fp:-O3:-hnoomp:-hnoacc:-hfp3:-hdynamic                lccrayh parallel
+%lopts               -em:-K:trap=fp:-O3:-hnoomp:-hnoacc:-hfp3:-hdynamic:-dynamic       lccrayh parallel
 %remote_username     <replace_by_your_HLRN-III_username>                               lccrayh parallel
 %memory              2300                                                              lccrayh parallel
 %modules             fftw:cray-hdf5-parallel:cray-netcdf-hdf5parallel                  lccrayh parallel
+%login_init_cmd      module:unload:cray-netcdf                                         lccrayh parallel
 #
 # HLRN-III Hannover debug/trace mode
@@ -73,9 +74,25 @@
 %cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayh parallel trace
 %mopts               -j:4                                                              lccrayh parallel trace
-%fopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp                            lccrayh parallel trace
-%lopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp                            lccrayh parallel trace
+%fopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp:-hnoacc                    lccrayh parallel trace
+%lopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp:-hnoacc                    lccrayh parallel trace
 %remote_username     <replace_by_your_HLRN-III_username>                               lccrayh parallel trace
 %memory              2300                                                              lccrayh parallel trace
 %modules             fftw:cray-hdf5-parallel:cray-netcdf-hdf5parallel                  lccrayh parallel trace
+%login_init_cmd      module:unload:cray-netcdf                                         lccrayh parallel trace
+#
+# HLRN-III Hannover haswell
+%tmp_user_catalog    /gfs1/tmp/<replace_by_your_HLRN-III_username>      lccrayh parallel has
+%tmp_data_catalog    /gfs1/work/<replace_by_your_HLRN-III_username>/palm_restart_data     lccrayh parallel has
+%compiler_name       ftn                                                lccrayh parallel has
+%compiler_name_ser   ftn                                                lccrayh parallel has
+%cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayh parallel has
+%feature             mpp2                                               lccrayh parallel has
+%mopts               -j:4                                               lccrayh parallel has
+%fopts               -em:-K:trap=fp:-O3:-hnoomp:-hnoacc:-hfp3:-hdynamic lccrayh parallel has
+%lopts               -em:-K:trap=fp:-O3:-hnoomp:-hnoacc:-hfp3:-hdynamic:-dynamic   lccrayh parallel has
+%remote_username     <replace_by_your_HLRN-III_username>                lccrayh parallel has
+%memory              2300                                               lccrayh parallel has
+%modules             fftw:cray-hdf5-parallel:cray-netcdf-hdf5parallel:craype-haswell   lccrayh parallel has
+%login_init_cmd      module:unload:cray-netcdf:craype-ivybridge         lccrayh parallel has
 #
 # HLRN-III Berlin
@@ -86,9 +103,10 @@
 %cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayb parallel
 %mopts               -j:4                                                              lccrayb parallel
-%fopts               -em:-O3:-hnoomp:-hfp3:-hdynamic                                   lccrayb parallel
-%lopts               -em:-O3:-hnoomp:-hfp3:-hdynamic:-dynamic                          lccrayb parallel
+%fopts               -em:-K:trap=fp:-O3:-hnoomp:-hnoacc:-hfp3:-hdynamic                lccrayb parallel
+%lopts               -em:-K:trap=fp:-O3:-hnoomp:-hnoacc:-hfp3:-hdynamic:-dynamic       lccrayb parallel
 %remote_username     <replace_by_your_HLRN-III_username>                               lccrayb parallel
 %memory              2300                                                              lccrayb parallel
 %modules             fftw:cray-hdf5-parallel:cray-netcdf-hdf5parallel                  lccrayb parallel
+%login_init_cmd      module:unload:cray-netcdf                                         lccrayb parallel
 #
 # HLRN-III Berlin debug/trace mode
@@ -99,9 +117,10 @@
 %cpp_options         -e:Z:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf4:-D__netcdf4_parallel:-D__fftw   lccrayb parallel trace
 %mopts               -j:4                                                              lccrayb parallel trace
-%fopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp                            lccrayb parallel trace
-%lopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp                            lccrayb parallel trace
+%fopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp:-hnoacc                    lccrayb parallel trace
+%lopts               -eD:-em:-g:-R:b:-K:trap=fp:-O0:-hnoomp:-hnoacc                    lccrayb parallel trace
 %remote_username     <replace_by_your_HLRN-III_username>                               lccrayb parallel trace
 %memory              2300                                                              lccrayb parallel trace
 %modules             fftw:cray-hdf5-parallel:cray-netcdf-hdf5parallel                  lccrayb parallel trace
+%login_init_cmd      module:unload:cray-netcdf                                         lccrayb parallel trace
 #
 %write_binary                true                             restart
@@ -111,4 +130,24 @@
 #----------------------------------------------------------------------------
 #IC:
+IC:[[ \$localhost = lccrayb ]]  &&  export ATP_ENABLED=1
+IC:[[ \$localhost = lccrayb ]]  &&  export MPICH_GNI_BTE_MULTI_CHANNEL=disabled
+#IC:[[ \$localhost = lccrayb ]]  &&  export APRUN_XFER_LIMITS=1
+#IC:[[ \$localhost = lccrayb ]]  &&  export APRUN_XFER_STACK_LIMIT=0
+#IC:[[ \$localhost = lccrayb ]]  &&  ulimit -v unlimited
+#IC:[[ \$localhost = lccrayb ]]  &&  ulimit -s unlimited
+#IC:[[ \$localhost = lccrayb ]]  &&  export MPICH_MPIIO_HINTS_DISPLAY=1
+#IC:[[ \$localhost = lccrayb ]]  &&  export MPICH_MPIIO_STATS=1
+#IC:[[ \$localhost = lccrayb ]]  &&  E8="=8"
+#IC:[[ \$localhost = lccrayb ]]  &&  export MPICH_MPIIO_HINTS="*DATA_**:striping_factor"\$E8
+IC:[[ \$localhost = lccrayh ]]  &&  export ATP_ENABLED=1
+IC:[[ \$localhost = lccrayh ]]  &&  export MPICH_GNI_BTE_MULTI_CHANNEL=disabled
+#IC:[[ \$localhost = lccrayh ]]  &&  export APRUN_XFER_LIMITS=1
+#IC:[[ \$localhost = lccrayh ]]  &&  export APRUN_XFER_STACK_LIMIT=0
+#IC:[[ \$localhost = lccrayh ]]  &&  ulimit -v unlimited
+#IC:[[ \$localhost = lccrayh ]]  &&  ulimit -s unlimited
+#IC:[[ \$localhost = lccrayh ]]  &&  export MPICH_MPIIO_HINTS_DISPLAY=1
+#IC:[[ \$localhost = lccrayh ]]  &&  export MPICH_MPIIO_STATS=1
+#IC:[[ \$localhost = lccrayh ]]  &&  E8="=8"
+#IC:[[ \$localhost = lccrayh ]]  &&  export MPICH_MPIIO_HINTS="*DATA_**:striping_factor"\$E8
 #
 #----------------------------------------------------------------------------
@@ -116,5 +155,4 @@
 #----------------------------------------------------------------------------
 EC:[[ \$locat = execution ]]  &&  cat  RUN_CONTROL
-EC:pwd; ls -al
 #
 #----------------------------------------------------------------------------
@@ -138,5 +176,5 @@
 LSF_DATA                 in:locopt     d3#:d3f  $base_data/$fname/INPUT    _lsf
 WTM_DATA                 in:locopt     d3#:d3f  $base_data/$fname/INPUT    _wtm
-BININ                    in:loc:flpe   d3f:rec  $base_data/$fname/RESTART   _d3d
+BININ                    in:loc:flpe   d3f:rec:cycfill  $base_data/$fname/RESTART   _d3d
 PARTICLE_RESTART_DATA_IN in:loc:flpe   prtf     $base_data/$fname/RESTART   _rprt
 DATA_1D_FL_NETCDF        in:locopt     flf      $output_data/$fname/OUTPUT  _fl     nc
