Changeset 475 for palm/trunk/SOURCE

Timestamp:

Feb 4, 2010 2:26:16 AM (14 years ago)

Author:

raasch

Message:

make options can be set in configuration file; bugfix for generating serial jobs; bugfix for masked output

Location:

palm/trunk/SOURCE

Files:

• CURRENT_MODIFICATIONS (modified) (5 diffs)
• data_output_mask.f90 (modified) (2 diffs)

palm/trunk/SOURCE/CURRENT_MODIFICATIONS

@@ -1 +1 @@
 New:
 ---
+make options (mopts) to be set by configuration file implemented (mrun, mbuild)
+
 humidity=.T. is now usable for runs with topography. wall_humidityflux and
 wall_scalarflux are the corresponding new parin arrays.
@@ -13 +15 @@
 has been added. (Makefile, palm_simple_install, palm_simple_run)
 
-check parameters, header, init_3d_model, Makefile, modules, parin, prognostic_equations, read_var_list, write_var_list
+check parameters, header, init_3d_model, Makefile, mbuild, modules, mrun, parin, prognostic_equations, read_var_list, write_var_list
 new: palm_simple_install, palm_simple_run, subsidence
 
@@ -19 +21 @@
 Changed:
 -------
+parallel make implemented (mbuild, mrun)
+
 2d-decomposition is default for Cray-XT machines (init_pegrid)
 
@@ -30 +34 @@
 Rogers and Yau. (collision_efficiency)
 
-advec_particles, collision_efficiency, init_3d_model, init_pegrid, modules
+advec_particles, collision_efficiency, init_3d_model, init_pegrid, mbuild, modules, mrun
 
 
 Errors:
 ------
+Bugfix for generating serial jobs (subjob)
+
 Bugfix: index problem concerning gradient_level indices removed (header)
 
@@ -60 +66 @@
 Bugfix: initialisation of var_mod (subsidence)
 
-advec_particles, calc_precipitation, collision_efficiency, disturb_field, header, modules, poisfft_hybrid, subsidence, sum_up_3d_data, time_integration
+advec_particles, calc_precipitation, collision_efficiency, disturb_field, header, modules, poisfft_hybrid, subjob, subsidence, sum_up_3d_data, time_integration
 
 

palm/trunk/SOURCE/data_output_mask.f90

@@ -4 +4 @@
 ! Actual revisions:
 ! -----------------
-! 
+! Bugfix in serial branch: arguments from array local_pf removed in N90_PUT_VAR
 !
 ! Former revisions:
@@ -427 +427 @@
        nc_stat = NF90_PUT_VAR( id_set_mask(mid,av),  &
             id_var_domask(mid,av,if),       &
-            local_pf(mask_size_l(mid,1),mask_size_l(mid,2), &
-                     mask_size_l(mid,3)),&
+            local_pf, &
             start = (/ 1, 1, 1, domask_time_count(mid,av) /), &
             count = (/ mask_size_l(mid,1), mask_size_l(mid,2), &