Changeset 3151


Ignore:
Timestamp:
Jul 19, 2018 8:45:38 AM (4 years ago)
Author:
raasch
Message:

output of PALM code revision number in palmrun header, some preprocessor define strings removed, small revisions in configuration files

Location:
palm/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/.palm.config.default

    r3043 r3151  
    9999# OUTPUT-commands - executed when program terminates normally
    100100#----------------------------------------------------------------------------
    101 #OC:echo "PALM job finished" | mailx user@somewhere
     101#OC:echo \\\"PALM job finished\\\" | mailx user@somewhere
    102102
    103103
  • palm/trunk/SCRIPTS/.palm.config.default.in

    r2834 r3151  
    7272# Lines must start with "IC:"
    7373#-------------------------------------------------------------------------------
    74 IC:export ATP_ENABLED=1
    75 IC:export MPICH_GNI_BTE_MULTI_CHANNEL=disabled
    7674IC:ulimit  -s unlimited
    7775#
  • palm/trunk/SCRIPTS/.palm.config.eddy_gfort

    r2972 r3151  
    1 #$Id: .palm.config.crayh 2834 2018-02-23 14:04:07Z raasch $
     1#$Id: .palm.config.eddy_gfort 2834 2018-02-23 14:04:07Z raasch $
    22#column 1          column 2
    33#name of variable  value of variable (~ must not be used)
     
    4646# INPUT-commands, executed before running PALM - lines must start with "IC:"
    4747#----------------------------------------------------------------------------
    48 IC:export ATP_ENABLED=1
    49 IC:export MPICH_GNI_BTE_MULTI_CHANNEL=disabled
    5048IC:ulimit  -s unlimited
    5149#
  • palm/trunk/SCRIPTS/.palm.config.imuk

    r2834 r3151  
    2323# INPUT-commands, executed before running PALM - lines must start with "IC:"
    2424#----------------------------------------------------------------------------
    25 #IC:
     25IC:ulimit -s unlimited
    2626#
    2727#----------------------------------------------------------------------------
  • palm/trunk/SCRIPTS/palmrun

    r3132 r3151  
    2727# -----------------
    2828# $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
    2933# create consistent error messages in case of failed restarts,
    3034# check existence of remote job catalog
     
    576580    then
    577581       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"
    579583       locat=config_file; exit   
    580584    fi
     
    943947
    944948             cd $user_source_path
    945              found=false
    946949
    947950             Names=$(ls -1 *.f90 2>&1)
     
    991994                   printf "\n      is not listed in Makefile \n"
    992995                   locat=source; exit
    993                 else
    994 
    995                    if [[ $found = false ]]
    996                    then
    997                       found=true
    998                       printf "\n\n  *** following user file(s) added to the"
    999                       printf " files to be translated:\n      "
    1000                    fi
    1001                    printf "$filename  "
    1002                    if [[ $silent == false ]]
    1003                    then
    1004                       sleep 0.5
    1005                    fi
    1006 
    1007996                fi
    1008997             done
    1009              [[ $found = true ]]  &&  printf "\n"
    1010998             cd -  > /dev/null
    1011999          fi
     
    15171505 printf "#------------------------------------------------------------------------# \n"
    15181506 printf "| %-35s%35s | \n" "$version" "$calltime"
     1507 printf "| %-35s%35s | \n" "PALM code    $global_revision" " "
    15191508 printf "|                                                                        | \n"
    15201509 column1="called on:"; column2=$(hostname)
  • palm/trunk/SOURCE/sum_up_3d_data.f90

    r3004 r3151  
    2525! -----------------
    2626! $Id$
     27! Remaining preprocessor directive __chem removed
     28!
     29! 3004 2018-04-27 12:33:25Z Giersch
    2730! prr field added to ONLY-list, prr* case/pr* case/precipitation_rate_av
    2831! removed, further allocation checks implemented
     
    532535!
    533536!--             Chemical quantity                                           
    534 #if defined( __chem )               
    535537                IF ( air_chemistry  .AND.  trimvar(1:3) == 'kc_')  THEN
    536538                   CALL chem_3d_data_averaging( 'allocate', doav(ii) )
    537539                ENDIF
    538 #endif
    539540
    540541!
  • palm/trunk/SOURCE/urban_surface_mod.f90

    r3136 r3151  
    2828! -----------------
    2929! $Id$
     30! remaining preprocessor define strings __check removed
     31!
     32! 3136 2018-07-16 14:48:21Z suehring
    3033! Limit also roughness length for heat and moisture where necessary
    3134!
     
    372375
    373376!-- configuration parameters (they can be setup in PALM config)
    374     LOGICAL                                        ::  usm_material_model = .TRUE.        !< flag parameter indicating wheather the  model of heat in materials is used
    375     LOGICAL                                        ::  usm_anthropogenic_heat = .FALSE.   !< flag parameter indicating wheather the anthropogenic heat sources (e.g.transportation) are used
    376     LOGICAL                                        ::  force_radiation_call_l = .FALSE.   !< flag parameter for unscheduled radiation model calls
    377     LOGICAL                                        ::  indoor_model = .FALSE.              !< whether to use the indoor model
    378     LOGICAL                                        ::  read_wall_temp_3d = .FALSE.
    379 
    380 
    381     INTEGER(iwp)                                   ::  building_type = 1                  !< default building type (preleminary setting)
    382     INTEGER(iwp)                                   ::  land_category = 2                  !< default category for land surface
    383     INTEGER(iwp)                                   ::  wall_category = 2                  !< default category for wall surface over pedestrian zone
    384     INTEGER(iwp)                                   ::  pedestrian_category = 2            !< default category for wall surface in pedestrian zone
    385     INTEGER(iwp)                                   ::  roof_category = 2                  !< default category for root surface
    386     REAL(wp)                                       ::  roughness_concrete = 0.001_wp      !< roughness length of average concrete surface
     377    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
    387390!
    388391!-- Indices of input attributes for (above) ground floor level
     
    54625465            ENDIF
    54635466           
    5464 #if defined( __parallel ) && ! defined ( __check )
     5467#if defined( __parallel )
    54655468            CALL MPI_BARRIER( comm2d, ierr )
    54665469#endif
     
    54965499            ENDIF
    54975500           
    5498 #if defined( __parallel ) && ! defined ( __check )
     5501#if defined( __parallel )
    54995502            CALL MPI_BARRIER( comm2d, ierr )
    55005503#endif
     
    68166819
    68176820            ENDIF
    6818 #if defined( __parallel ) && ! defined ( __check )
     6821#if defined( __parallel )
    68196822            CALL MPI_BARRIER( comm2d, ierr )
    68206823#endif
    68216824        ENDDO
    68226825       
    6823         !
     6826!
    68246827!--     check completeness and formal correctness of the data
    68256828        DO i = nxlg, nxrg
     
    72537256                CALL message( 'usm_read_wall_temperature', 'PA0523', 1, 2, 0, 6, 0 )
    72547257            ENDIF
    7255 #if defined( __parallel ) && ! defined ( __check )
     7258#if defined( __parallel )
    72567259            CALL MPI_BARRIER( comm2d, ierr )
    72577260#endif
Note: See TracChangeset for help on using the changeset viewer.