- Timestamp:
- Jul 19, 2018 8:45:38 AM (6 years ago)
- Location:
- palm/trunk
- Files:
-
- 7 edited
-
SCRIPTS/.palm.config.default (modified) (1 diff)
-
SCRIPTS/.palm.config.default.in (modified) (1 diff)
-
SCRIPTS/.palm.config.eddy_gfort (modified) (2 diffs)
-
SCRIPTS/.palm.config.imuk (modified) (1 diff)
-
SCRIPTS/palmrun (modified) (5 diffs)
-
SOURCE/sum_up_3d_data.f90 (modified) (2 diffs)
-
SOURCE/urban_surface_mod.f90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/.palm.config.default
r3043 r3151 99 99 # OUTPUT-commands - executed when program terminates normally 100 100 #---------------------------------------------------------------------------- 101 #OC:echo "PALM job finished" | mailx user@somewhere101 #OC:echo \\\"PALM job finished\\\" | mailx user@somewhere 102 102 103 103 -
palm/trunk/SCRIPTS/.palm.config.default.in
r2834 r3151 72 72 # Lines must start with "IC:" 73 73 #------------------------------------------------------------------------------- 74 IC:export ATP_ENABLED=175 IC:export MPICH_GNI_BTE_MULTI_CHANNEL=disabled76 74 IC:ulimit -s unlimited 77 75 # -
palm/trunk/SCRIPTS/.palm.config.eddy_gfort
r2972 r3151 1 #$Id: .palm.config. crayh2834 2018-02-23 14:04:07Z raasch $1 #$Id: .palm.config.eddy_gfort 2834 2018-02-23 14:04:07Z raasch $ 2 2 #column 1 column 2 3 3 #name of variable value of variable (~ must not be used) … … 46 46 # INPUT-commands, executed before running PALM - lines must start with "IC:" 47 47 #---------------------------------------------------------------------------- 48 IC:export ATP_ENABLED=149 IC:export MPICH_GNI_BTE_MULTI_CHANNEL=disabled50 48 IC:ulimit -s unlimited 51 49 # -
palm/trunk/SCRIPTS/.palm.config.imuk
r2834 r3151 23 23 # INPUT-commands, executed before running PALM - lines must start with "IC:" 24 24 #---------------------------------------------------------------------------- 25 #IC: 25 IC:ulimit -s unlimited 26 26 # 27 27 #---------------------------------------------------------------------------- -
palm/trunk/SCRIPTS/palmrun
r3132 r3151 27 27 # ----------------- 28 28 # $Id$ 29 # removed additional listing of files to be compiled, print PALM code revision 30 # in header 31 # 32 # 3132 2018-07-16 11:44:58Z raasch 29 33 # create consistent error messages in case of failed restarts, 30 34 # check existence of remote job catalog … … 576 580 then 577 581 printf "\n +++ no hostfile \"$hostfile\" found" 578 printf "\n Please check line \" %hostfile ...\" in $config_file"582 printf "\n Please check line \"hostfile ...\" in $config_file" 579 583 locat=config_file; exit 580 584 fi … … 943 947 944 948 cd $user_source_path 945 found=false946 949 947 950 Names=$(ls -1 *.f90 2>&1) … … 991 994 printf "\n is not listed in Makefile \n" 992 995 locat=source; exit 993 else994 995 if [[ $found = false ]]996 then997 found=true998 printf "\n\n *** following user file(s) added to the"999 printf " files to be translated:\n "1000 fi1001 printf "$filename "1002 if [[ $silent == false ]]1003 then1004 sleep 0.51005 fi1006 1007 996 fi 1008 997 done 1009 [[ $found = true ]] && printf "\n"1010 998 cd - > /dev/null 1011 999 fi … … 1517 1505 printf "#------------------------------------------------------------------------# \n" 1518 1506 printf "| %-35s%35s | \n" "$version" "$calltime" 1507 printf "| %-35s%35s | \n" "PALM code $global_revision" " " 1519 1508 printf "| | \n" 1520 1509 column1="called on:"; column2=$(hostname) -
palm/trunk/SOURCE/sum_up_3d_data.f90
r3004 r3151 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Remaining preprocessor directive __chem removed 28 ! 29 ! 3004 2018-04-27 12:33:25Z Giersch 27 30 ! prr field added to ONLY-list, prr* case/pr* case/precipitation_rate_av 28 31 ! removed, further allocation checks implemented … … 532 535 ! 533 536 !-- Chemical quantity 534 #if defined( __chem )535 537 IF ( air_chemistry .AND. trimvar(1:3) == 'kc_') THEN 536 538 CALL chem_3d_data_averaging( 'allocate', doav(ii) ) 537 539 ENDIF 538 #endif539 540 540 541 ! -
palm/trunk/SOURCE/urban_surface_mod.f90
r3136 r3151 28 28 ! ----------------- 29 29 ! $Id$ 30 ! remaining preprocessor define strings __check removed 31 ! 32 ! 3136 2018-07-16 14:48:21Z suehring 30 33 ! Limit also roughness length for heat and moisture where necessary 31 34 ! … … 372 375 373 376 !-- configuration parameters (they can be setup in PALM config) 374 LOGICAL 375 LOGICAL 376 LOGICAL 377 LOGICAL :: indoor_model = .FALSE.!< whether to use the indoor model378 LOGICAL 379 380 381 INTEGER(iwp) :: building_type = 1!< default building type (preleminary setting)382 INTEGER(iwp) :: land_category = 2!< default category for land surface383 INTEGER(iwp) :: wall_category = 2!< default category for wall surface over pedestrian zone384 INTEGER(iwp) :: pedestrian_category = 2!< default category for wall surface in pedestrian zone385 INTEGER(iwp) :: roof_category = 2!< default category for root surface386 REAL(wp) :: roughness_concrete = 0.001_wp!< roughness length of average concrete surface377 LOGICAL :: usm_material_model = .TRUE. !< flag parameter indicating wheather the model of heat in materials is used 378 LOGICAL :: usm_anthropogenic_heat = .FALSE. !< flag parameter indicating wheather the anthropogenic heat sources (e.g.transportation) are used 379 LOGICAL :: force_radiation_call_l = .FALSE. !< flag parameter for unscheduled radiation model calls 380 LOGICAL :: indoor_model = .FALSE. !< whether to use the indoor model 381 LOGICAL :: read_wall_temp_3d = .FALSE. 382 383 384 INTEGER(iwp) :: building_type = 1 !< default building type (preleminary setting) 385 INTEGER(iwp) :: land_category = 2 !< default category for land surface 386 INTEGER(iwp) :: wall_category = 2 !< default category for wall surface over pedestrian zone 387 INTEGER(iwp) :: pedestrian_category = 2 !< default category for wall surface in pedestrian zone 388 INTEGER(iwp) :: roof_category = 2 !< default category for root surface 389 REAL(wp) :: roughness_concrete = 0.001_wp !< roughness length of average concrete surface 387 390 ! 388 391 !-- Indices of input attributes for (above) ground floor level … … 5462 5465 ENDIF 5463 5466 5464 #if defined( __parallel ) && ! defined ( __check )5467 #if defined( __parallel ) 5465 5468 CALL MPI_BARRIER( comm2d, ierr ) 5466 5469 #endif … … 5496 5499 ENDIF 5497 5500 5498 #if defined( __parallel ) && ! defined ( __check )5501 #if defined( __parallel ) 5499 5502 CALL MPI_BARRIER( comm2d, ierr ) 5500 5503 #endif … … 6816 6819 6817 6820 ENDIF 6818 #if defined( __parallel ) && ! defined ( __check )6821 #if defined( __parallel ) 6819 6822 CALL MPI_BARRIER( comm2d, ierr ) 6820 6823 #endif 6821 6824 ENDDO 6822 6825 6823 6826 ! 6824 6827 !-- check completeness and formal correctness of the data 6825 6828 DO i = nxlg, nxrg … … 7253 7256 CALL message( 'usm_read_wall_temperature', 'PA0523', 1, 2, 0, 6, 0 ) 7254 7257 ENDIF 7255 #if defined( __parallel ) && ! defined ( __check )7258 #if defined( __parallel ) 7256 7259 CALL MPI_BARRIER( comm2d, ierr ) 7257 7260 #endif
Note: See TracChangeset
for help on using the changeset viewer.
