Changeset 555 for palm/trunk/SCRIPTS

Timestamp:

Sep 7, 2010 7:32:53 AM (14 years ago)

Author:

raasch

Message:

New:
---

Changed:

---

Documentation for surface_heatflux in case of prandtl_layer = .F. improved.

bugfix for wrong netcdf/3.6.3 module on lcsgi (mbuild, mrun)

Errors:

---

Bugfix in if statement (disturb_heatflux)

Bugfix: in 2201 statement: closing " was missing (interpret_config)

Bugfix: default setting of nzb_local for flat topography (init_grid)

Bugfix: wrong dimension used for ts_value_l (user_statistics)

disturb_heatflux, init_grid, interpret_config, user_statistics

Location:

palm/trunk/SCRIPTS

Files:

• .mrun.config.imuk_ice2_netcdf4 (modified) (1 diff)
• mbuild (modified) (2 diffs)
• mrun (modified) (2 diffs)
• subjob (modified) (1 diff)

palm/trunk/SCRIPTS/.mrun.config.imuk_ice2_netcdf4

@@ -54 +54 @@
 %netcdf_lib        -L/sw/dataformats/pnetcdf/netcdf-4.0.1-mvapich2-intel/lib:-lnetcdf:-lnetcdff:-L/sw/dataformats/phdf5/hdf5-1.8.2-mvapich2-intel/lib:-lhdf5:-lhdf5_hl:-lz      lcsgih parallel ice2
 %mopts             -j:4                                       lcsgih parallel ice2
-%fopts             -xSSE4.2:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian  lcsgih parallel ice2
-%lopts             -xSSE4.2:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib                 lcsgih parallel ice2
+%fopts             -xSSE4.2:-fp-model:precise:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-convert:little_endian  lcsgih parallel ice2
+%lopts             -xSSE4.2:-fp-model:precise:-O3:-cpp:-r8:-align:all:-ftz:-fno-alias:-no-prec-div:-no-prec-sqrt:-ip:-nbs:-Vaxlib                 lcsgih parallel ice2
 %memory            1500                                       lcsgih parallel ice2
-#%tmp_data_catalog  /gfs1/work/<replace by your HLRN username>/palm_restart_data      lcsgih parallel
-#%tmp_user_catalog  /gfs1/tmp/<replace by your HLRN username>                         lcsgih parallel
+#%tmp_data_catalog  /gfs2/work/<replace by your HLRN username>/palm_restart_data      lcsgih parallel
+#%tmp_user_catalog  /gfs2/tmp/<replace by your HLRN username>                         lcsgih parallel
 #
 #

palm/trunk/SCRIPTS/mbuild

@@ -111 +111 @@
      # 16/08/10 - BjornM- bugfix: call of modules on local host, new workaround
      #                    for lcxt4
+     # 07/09/10 - Siggi - bugfix for wrong netcdf/3.6.3 module on lcsgi
 
 
@@ -1036 +1037 @@
           then
              module_calls="module load ${modules};"
+
+                # bugfix for wrong netcdf module
+             if [[ $remote_host = lcsgib  ||  $remote_host = lcsgih ]]
+             then
+                if [[ $(echo $module_calls | grep -c netcdf/3.6.3-intel) != 0 ]]
+                then
+                   module_calls="$module_calls export LD_LIBRARY_PATH=/sw/dataformats/netcdf/3.6.3-intel/lib:\$LD_LIBRARY_PATH;"
+                fi
+             fi
           else
              module_calls=""

palm/trunk/SCRIPTS/mrun

@@ -209 +209 @@
      #                     hicegate0/bicegate0 instead of the IP addresses
      # 17/08/10 - BjornM - adjustments for interactive runs on lcxt4
+     # 07/09/10 - Siggi  - bugfix for wrong netcdf/3.6.3 module on lcsgi
 
 
@@ -2118 +2119 @@
  fi
 
+    # bugfix for wrong netcdf module
+ if [[ $remote_host = lcsgib  ||  $remote_host = lcsgih ]]
+ then
+    if [[ $(echo $module_calls | grep -c netcdf/3.6.3-intel) != 0 ]]
+    then
+       module_calls="$module_calls export LD_LIBRARY_PATH=/sw/dataformats/netcdf/3.6.3-intel/lib:\$LD_LIBRARY_PATH;"
+    fi
+ fi
+
 
     # SET DEFAULT VALUE FOR MPI MODULE TO BE USED ON SGI-ALTIX

palm/trunk/SCRIPTS/subjob

@@ -1354 +1354 @@
           chmod  u+x  $job_on_remhost
 
-       elif [[ $(echo $local_host | cut -c1-5) = lcsgi ]]
-       then
-          eval  $submcom  $job_on_remhost
        elif [[ $local_host = nech ]]
        then