Changeset 818 for palm/trunk/SOURCE

Timestamp:

Feb 8, 2012 4:11:23 PM (13 years ago)

Author:

maronga

Message:

bugfix: namelist file check now possible for topography and re-enabled. mrungui update (-z option)

Location:

palm/trunk/SOURCE

Files:

• Makefile_check (modified) (5 diffs)
• check_namelist_files.f90 (modified) (2 diffs)
• init_grid.f90 (modified) (6 diffs)

palm/trunk/SOURCE/Makefile_check

@@ -4 +4 @@
 # Current revisions:
 # ------------------
-#
+# Added all user routines.
 #
 # Former revisions:
@@ -27 +27 @@
       message.f90 modules.f90 package_parin.f90 parin.f90 poisfft.f90 \
       poisfft_hybrid.f90 singleton.f90 subsidence.f90 temperton_fft.f90 \
+      user_3d_data_averaging.f90 user_actions.f90 \
+      user_additional_routines.f90 user_advec_particles.f90 \
       user_check_data_output.f90 user_check_data_output_pr.f90 \
-      user_check_parameters.f90 user_init.f90 user_init_3d_model.f90 \
-      user_init_grid.f90 user_init_particles.f90 user_init_plant_canopy.f90 \
-      user_module.f90 user_parin.f90  \
+      user_check_parameters.f90 user_data_output_2d.f90 \
+      user_data_output_3d.f90 user_data_output_dvrp.f90 user_data_output_mask.f90 \
+      user_define_netcdf_grid.f90 user_dvrp_coltab.f90 user_header.f90 \
+      user_init.f90 user_init_3d_model.f90 user_init_grid.f90 \
+      user_init_particles.f90 user_init_plant_canopy.f90 \
+      user_last_actions.f90 user_module.f90 user_parin.f90 \
+      user_particle_attributes.f90 user_read_restart_data.f90 \
+      user_spectra.f90 user_statistics.f90 \
+
+
 
 
@@ -38 +47 @@
       modules.o package_parin.o parin.o poisfft.o \
       poisfft_hybrid.o singleton.o subsidence.o temperton_fft.o \
-      user_check_data_output.o user_check_data_output_pr.o \
-      user_check_parameters.o user_init.o user_init_3d_model.o \
-      user_init_grid.o user_init_particles.o user_init_plant_canopy.o \
-      user_module.o user_parin.o  \
+      user_3d_data_averaging.o user_actions.o user_additional_routines.o \
+      user_advec_particles.o user_check_data_output.o \
+      user_check_data_output_pr.o user_check_parameters.o \
+      user_data_output_2d.o user_data_output_3d.o user_data_output_mask.o user_data_output_dvrp.o \
+      user_define_netcdf_grid.o user_dvrp_coltab.o user_header.o \
+      user_init.o user_init_3d_model.o user_init_grid.o \
+      user_init_particles.o user_init_plant_canopy.o user_last_actions.o \
+      user_module.o user_parin.o user_particle_attributes.o \
+      user_read_restart_data.o user_spectra.o user_statistics.o \
 
 CC = cc
@@ -88 +102 @@
 subsidence.o: modules.o
 temperton_fft.o: modules.o
+user_3d_data_averaging.o: modules.o user_module.o
+user_actions.o: modules.o user_module.o
+user_additional_routines.o: modules.o user_module.o
+user_advec_particles.o: modules.o user_module.o
+user_check_data_output.o: modules.o user_module.o
+user_check_data_output_pr.o: modules.o user_module.o
+user_check_parameters.o: modules.o user_module.o
+user_data_output_2d.o: modules.o user_module.o
+user_data_output_3d.o: modules.o user_module.o
+user_data_output_mask.o: modules.o user_module.o
+user_data_output_dvrp.o: modules.o user_module.o
+user_define_netcdf_grid.o: modules.o user_module.o
+user_dvrp_coltab.o: modules.o user_module.o
+user_header.o: modules.o user_module.o
 user_init.o: modules.o user_module.o
 user_init_3d_model.o: modules.o user_module.o
@@ -93 +121 @@
 user_init_particles.o: modules.o user_module.o
 user_init_plant_canopy.o: modules.o user_module.o
+user_last_actions.o: modules.o user_module.o
 user_module.o: user_module.f90
 user_parin.o: modules.o user_module.o
-user_check_parameters.o: modules.o user_module.o
-user_check_data_output.o: modules.o user_module.o
-user_check_data_output_pr.o: modules.o user_module.o
+user_particle_attributes.o: modules.o user_module.o
+user_read_restart_data.o: modules.o user_module.o
+user_spectra.o: modules.o user_module.o
+user_statistics.o: modules.o user_module.o

palm/trunk/SOURCE/check_namelist_files.f90

@@ -35 +35 @@
 10  CONTINUE
 
+
 !
 !-- Read control parameters from NAMELIST files and read environment-variables1
@@ -48 +49 @@
 
 
-!
 !-- Check control parameters and deduce further quantities    
     CALL check_parameters
 
 
+
  END PROGRAM check_namelist_files

palm/trunk/SOURCE/init_grid.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! Bugfix: topo_height is only required if topography is used. It is thus now
+! allocated in the topography branch
 !
 ! Former revisions:
@@ -38 +39 @@
 !
 ! 555 2010-09-07 07:32:53Z raasch
-! Bugfix: default setting of nzb_local for flat topographie
+! Bugfix: default setting of nzb_local for flat topography
 !
 ! 274 2009-03-26 15:11:21Z heinze
@@ -100 +101 @@
     REAL    ::  dx_l, dy_l, dz_stretched
 
-    REAL, DIMENSION(0:ny,0:nx)          ::  topo_height
+    REAL, DIMENSION(:,:), ALLOCATABLE   ::  topo_height
 
     REAL, DIMENSION(:,:,:), ALLOCATABLE ::  distance
@@ -331 +332 @@
     ALLOCATE( l_wall(nzb:nzt+1,nysg:nyng,nxlg:nxrg) )
 
+
     nzb_s_inner = nzb;  nzb_s_outer = nzb
     nzb_u_inner = nzb;  nzb_u_outer = nzb
@@ -517 +519 @@
        CASE ( 'read_from_file' )
 
+          ALLOCATE ( topo_height(0:ny,0:nx) )
+
           DO  ii = 0, io_blocks-1
              IF ( ii == io_group )  THEN
@@ -552 +556 @@
              ENDDO
           ENDDO
+
+          DEALLOCATE ( topo_height )
 !
 !--       Add cyclic boundaries (additional layers are for calculating