Changeset 412 for palm/trunk
- Timestamp:
- Dec 14, 2009 7:14:46 AM (15 years ago)
- Location:
- palm/trunk
- Files:
-
- 4 edited
-
SCRIPTS/mrun (modified) (3 diffs)
-
SOURCE/CURRENT_MODIFICATIONS (modified) (3 diffs)
-
SOURCE/modules.f90 (modified) (2 diffs)
-
SOURCE/poisfft_hybrid.f90 (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mrun
r405 r412 3185 3185 if [[ $use_openmp = false ]] 3186 3186 then 3187 export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts" 3187 if [[ "$sgi_feature" = ice2 ]] 3188 then 3189 export MPI_DSM_CPULIST="0,4,1,5,2,6,3,7:allhosts" 3190 else 3191 export MPI_DSM_CPULIST="0,1,4,5,2,3,6,7:allhosts" 3192 fi 3188 3193 fi 3189 3194 # MPI_IB_RAILS: use both IB rails on ICE2 … … 3192 3197 # NECESSARY, IF MORE THAN 4096 PEs ARE USED 3193 3198 export MPI_CONNECTIONS_THRESHOLD=8192 3199 echo "*** MPI_DSM_CPULIST=$MPI_DSM_CPULIST" 3194 3200 mpiexec_mpt -np $ii ./a.out $ROPTS < runfile_atmos 3195 3201 … … 3202 3208 # export MV2_ENABLE_AFFINITY=1 3203 3209 # export MV2_CPU_MAPPING=0,1,4,5,2,3,6,7 3210 # if [[ "$sgi_feature" = ice2 ]] 3211 # then 3212 # export MV2_CPU_MAPPING=0,4,1,5,2,6,3,7 3213 # else 3214 # export MV2_CPU_MAPPING=0,1,4,5,2,3,6,7 3215 # fi 3216 echo "*** MV2_CPU_MAPPING=$MV2_CPU_MAPPING" 3204 3217 if [[ $threads_per_task != 1 ]] 3205 3218 then -
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r411 r412 10 10 write_var_list) 11 11 12 check parameters, header, init_3d_model, Makefile, modules, parin prognostic equations, read_var_list, subsidence, write_var_list 12 check parameters, header, init_3d_model, Makefile, modules, parin, prognostic_equations, read_var_list, write_var_list 13 new: subsidence 14 13 15 14 16 Changed: … … 21 23 Errors: 22 24 ------ 25 Dimension of array stat in cascade change to prevent type problems with 26 mpi2 libraries (poisfft_hybrid) 27 23 28 Bugfix: exchange of ghost points for prho included (time_integration) 24 29 … … 30 35 messages from gfortran compiler (modules) 31 36 32 calc_precipitation, modules, sum_up_3d_data, time_integration37 calc_precipitation, modules, poisfft_hybrid, sum_up_3d_data, time_integration 33 38 34 39 -
palm/trunk/SOURCE/modules.f90
r411 r412 717 717 topography_color = (/ 0.8, 0.7, 0.6 /) 718 718 719 !#if defined( __decalpha )719 #if defined( __decalpha ) 720 720 REAL, DIMENSION(2,10) :: slicer_range_limits_dvrp = RESHAPE( (/ & 721 721 -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, & … … 744 744 interval_s_dvrp_prt = 1.0, & 745 745 interval_a_dvrp_prt = 0.0 746 !#else747 !REAL, DIMENSION(2,10) :: slicer_range_limits_dvrp748 749 !REAL, DIMENSION(3,10) :: isosurface_color750 751 !REAL(4), DIMENSION(2,100) :: interval_values_dvrp, &752 !interval_values_dvrp_prt, interval_h_dvrp, &753 !interval_h_dvrp_prt, interval_l_dvrp = 0.5, &754 !interval_l_dvrp_prt = 0.5, interval_s_dvrp = 1.0, &755 !interval_s_dvrp_prt = 1.0, interval_a_dvrp = 0.0, &756 !interval_a_dvrp_prt = 0.0757 758 !DATA slicer_range_limits_dvrp / -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &759 !-1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &760 !-1.0, 1.0, -1.0, 1.0, -1.0, 1.0, &761 !-1.0, 1.0 /762 763 !DATA isosurface_color / 0.9, 0.9, 0.9, 0.8, 0.1, 0.1, 0.1, 0.1, 0.8, &764 !0.1, 0.8, 0.1, 0.6, 0.1, 0.1, 0.1, 0.1, 0.6, &765 !0.1, 0.6, 0.1, 0.4, 0.1, 0.1, 0.1, 0.1, 0.4, &766 !0.1, 0.4, 0.1 /767 768 !DATA interval_h_dvrp / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &769 !25.0, -25.0, 192 * 0.0 /770 771 !DATA interval_h_dvrp_prt / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, &772 !25.0, -25.0, 192 * 0.0 /773 !#endif746 #else 747 REAL, DIMENSION(2,10) :: slicer_range_limits_dvrp 748 749 REAL, DIMENSION(3,10) :: isosurface_color 750 751 REAL(4), DIMENSION(2,100) :: interval_values_dvrp, & 752 interval_values_dvrp_prt, interval_h_dvrp, & 753 interval_h_dvrp_prt, interval_l_dvrp = 0.5, & 754 interval_l_dvrp_prt = 0.5, interval_s_dvrp = 1.0, & 755 interval_s_dvrp_prt = 1.0, interval_a_dvrp = 0.0, & 756 interval_a_dvrp_prt = 0.0 757 758 DATA slicer_range_limits_dvrp / -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, & 759 -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, & 760 -1.0, 1.0, -1.0, 1.0, -1.0, 1.0, & 761 -1.0, 1.0 / 762 763 DATA isosurface_color / 0.9, 0.9, 0.9, 0.8, 0.1, 0.1, 0.1, 0.1, 0.8, & 764 0.1, 0.8, 0.1, 0.6, 0.1, 0.1, 0.1, 0.1, 0.6, & 765 0.1, 0.6, 0.1, 0.4, 0.1, 0.1, 0.1, 0.1, 0.4, & 766 0.1, 0.4, 0.1 / 767 768 DATA interval_h_dvrp / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, & 769 25.0, -25.0, 192 * 0.0 / 770 771 DATA interval_h_dvrp_prt / 270.0, 225.0, 225.0, 180.0, 70.0, 25.0, & 772 25.0, -25.0, 192 * 0.0 / 773 #endif 774 774 775 775 REAL(4), DIMENSION(:), ALLOCATABLE :: xcoor_dvrp, ycoor_dvrp, zcoor_dvrp -
palm/trunk/SOURCE/poisfft_hybrid.f90
r392 r412 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Dimension of array stat in cascade change to prevent type problems with 7 ! mpi2 libraries 7 8 ! 8 9 ! Former revisions: … … 1003 1004 INTEGER, SAVE :: tag = 10 1004 1005 #if defined( __parallel ) 1005 INTEGER, DIMENSION(MPI_STATUS_SIZE ) :: stat1006 INTEGER, DIMENSION(MPI_STATUS_SIZE,1) :: stat 1006 1007 #endif 1007 1008
Note: See TracChangeset
for help on using the changeset viewer.
