Changeset 170 for palm/trunk

Timestamp:

May 22, 2008 12:51:21 PM (17 years ago)

Author:

raasch

Message:

bugfix in read_var_list, default mrun_config changed

Location:

palm/trunk

Files:

• SCRIPTS/.mrun.config.default (modified) (1 diff)
• SOURCE/read_var_list.f90 (modified) (6 diffs)

palm/trunk/SCRIPTS/.mrun.config.default

@@ -27 +27 @@
 %compiler_name     mpif90                                        lcmuk parallel
 %compiler_name_ser ifort                                         lcmuk parallel
-%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf_64bit:-D__intel_openmp_bug   lcmuk parallel
-%netcdf_inc        -I:/muksoft/packages/netcdf/linux/include            lcmuk parallel
-%netcdf_lib        -L/muksoft/packages/netcdf/linux/lib:-lnetcdf        lcmuk parallel
-%fopts             -axW:-cpp:-openmp:-r8:-nbs:-convert:little_endian     lcmuk parallel
-%lopts             -axW:-cpp:-openmp:-r8:-nbs:-Vaxlib                    lcmuk parallel
+%cpp_options       -D__mpi2:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__netcdf:-D__netcdf_64bit:-D__intel_openmp_bug   lcmuk parallel
+%netcdf_inc        -I:/muksoft_64/packages/netcdf/3.6.2/include            lcmuk parallel
+%netcdf_lib        -L/muksoft_64/packages/netcdf/3.6.2/lib:-lnetcdf        lcmuk parallel
+%fopts             -axW:-cpp:-openmp:-r8:-nbs:-convert:little_endian:-I:/muksoft/packages/mpich2/2.1.0.4/include     lcmuk parallel
+%lopts             -axW:-cpp:-openmp:-r8:-nbs:-Vaxlib:-L:/muksoft/packages/mpich2/2.1.0.4/lib                    lcmuk parallel
 #%hostfile          $base_directory/.hostfile                    lcmuk parallel
 #

palm/trunk/SOURCE/read_var_list.f90

@@ -583 +583 @@
 
     INTEGER ::  idum, max_pr_user_on_file, nz_on_file, &
-                statistic_regions_on_file
+                statistic_regions_on_file, tmp_mpru, tmp_sr
 
     REAL, DIMENSION(:,:,:),   ALLOCATABLE ::  hom_sum_on_file
@@ -645 +645 @@
     ENDIF
     READ ( 13 )  max_pr_user_on_file
-    IF ( max_pr_user_on_file > max_pr_user )  THEN
+    IF ( max_pr_user_on_file /= max_pr_user )  THEN
        IF ( myid == 0 )  THEN
-          PRINT*, '+++ read_parts_of_var_list: too many user profiles on res', &
-                       'tart data file'
+          PRINT*, '+++ read_parts_of_var_list: number of user profiles on res', &
+                       'tart data file differs from the current run'
           PRINT*, '                   max_pr_user on file    = "', &
                   max_pr_user_on_file, '"'
@@ -654 +654 @@
                   max_pr_user, '"'
        ENDIF
-       CALL local_stop
+       tmp_mpru = MIN( max_pr_user_on_file, max_pr_user )
+    ELSE
+       tmp_mpru = max_pr_user
     ENDIF
 
@@ -666 +668 @@
     IF ( statistic_regions_on_file > statistic_regions )  THEN
        IF ( myid == 0 )  THEN
-          PRINT*, '+++ read_parts_of_var_list: too many statistic regions on', &
-                       ' restart data file'
-          PRINT*, '                   statistic regions on file    = "', &
-                  max_pr_user_on_file, '"'
-          PRINT*, '                   statistic regions from run   = "', &
-                  max_pr_user, '"'
+          PRINT*, '+++ read_parts_of_var_list: WARNING: statistic regions on', &
+                       ' restart data file differ from the current run'
+          PRINT*, '                            statistic regions on file    = "', &
+                  statistic_regions_on_file, '"'
+          PRINT*, '                            statistic regions from run   = "', &
+                  statistivc_regions, '"'
+          PRINT*, '                            statistic data may be lost!'
        ENDIF
-       CALL local_stop
+       tmp_sr = MIN( statistic_regions_on_file, statistic_regions )
+    ELSE
+       tmp_sr = statistic_regions
     ENDIF
 
@@ -703 +708 @@
                        0:statistic_regions_on_file) )
              READ ( 13 )  hom_on_file
-             hom = hom_on_file(:,:,1:pr_palm+max_pr_user,0:statistic_regions)
+             hom(:,:,1:pr_palm+tmp_mpru,0:tmp_sr) = &
+                          hom_on_file(:,:,1:pr_palm+tmp_mpru,0:tmp_sr)
              DEALLOCATE( hom_on_file )
 
@@ -710 +716 @@
                        0:statistic_regions_on_file) )
              READ ( 13 )  hom_sum_on_file
-             hom_sum = hom_sum_on_file(:,1:pr_palm+max_pr_user, &
-                                       0:statistic_regions)
+             hom_sum(:,1:pr_palm+tmp_mpru,0:tmp_sr) = &
+                          hom_sum_on_file(:,1:pr_palm+tmp_mpru,0:tmp_sr)
              DEALLOCATE( hom_sum_on_file )