Changeset 841


Ignore:
Timestamp:
Feb 28, 2012 12:29:49 PM (13 years ago)
Author:
maronga
Message:

further adjustments and bugfixes for the namelist file check

Location:
palm/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/mrun

    r838 r841  
    250250     # 22/02/12 - Siggi  - -s info updated
    251251     # 22/02/12 - Siggi  - case "-s WP" removed
     252     # 28/02/12 - BjornM - further adjustments for namelist file check
    252253
    253254
     
    23622363
    23632364#### PERFORM PARAMETER FILE CHECK (COUPLED RUNS ARE NOT SUPPORTED YET)
     2365
     2366#DEFINE VARIABLES FOR FREQUENTLY USED DIRECTORIES
     2367 check_depository="${working_directory}/trunk/UTIL"
     2368 check_sources="${working_directory}/tmp_check_namelist_files"
    23642369 skip_check=false
     2370
     2371#CHECK IF NAMELIST_FILE_CHECK HAS BEEN COMPILED SUCCESSFULLY
     2372 if [[ ! -f $check_depository/check_namelist_files.tar || ! -f $PALM_BIN/check_namelist_files.x ]]
     2373 then
     2374    skip_check=true
     2375
     2376 fi
     2377
     2378#ONLY PERFORM CHECK IF -z OPTION IS NOT SET, NO RESTART RUN IS CARRIED OUT AND IF THE EXECUTION HOST IS THE LOCAL HOST
    23652379 if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true || $restart_run == true ]]
    23662380 then
     
    24212435       printf "\n  +++ no PARIN list entry found for d3f in the configuration file."
    24222436    fi
     2437
    24232438#   GET TOPOGRAPHY PARAMETER FILE SUFFIX (USUALLY "_P3DF"). THIS FILE MIGHT IS
    24242439#   NOT NECESSARILY REQUIRED
     
    24422457
    24432458    rm -rf ${working_directory}/tmp_check
    2444 
    2445 #   DEFINE VARIABLES FOR FREQUENTLY USED DIRECTORIES
    2446     check_depository="${working_directory}/trunk/UTIL"
    2447     check_sources="${working_directory}/tmp_check_namelist_files"
    24482459
    24492460#   CHECK IF THE A P3DF FILE MUST BE CHECKED
  • palm/trunk/SOURCE/Makefile_check

    r819 r841  
    44# Current revisions:
    55# ------------------
     6# Added: exchange_horiz, exchange_horiz_2d, random_function
    67#
    78# Former revisions:
     
    2526
    2627RCS = check_open.f90 check_namelist_files.f90 check_parameters.f90 \
    27       close_file.f90 cpu_log.f90 fft_xy.f90 init_grid.f90 init_masks.f90 \
     28      close_file.f90 cpu_log.f90 exchange_horiz.f90 exchange_horiz_2d.f90 \
     29      fft_xy.f90 init_grid.f90 init_masks.f90 \
    2830      init_pegrid.f90 local_flush.f90 local_stop.f90 local_system.f90 \
    2931      message.f90 modules.f90 package_parin.f90 parin.f90 poisfft.f90 \
    30       poisfft_hybrid.f90 singleton.f90 subsidence.f90 temperton_fft.f90 \
     32      poisfft_hybrid.f90 random_function.f90 singleton.f90 subsidence.f90 \
     33      temperton_fft.f90 \
    3134      user_3d_data_averaging.f90 user_actions.f90 \
    3235      user_additional_routines.f90 user_advec_particles.f90 \
     
    4548
    4649OBJS = check_open.o check_namelist_files.o check_parameters.o close_file.o \
    47       cpu_log.o fft_xy.o init_grid.o init_masks.o init_pegrid.o \
     50      cpu_log.o exchange_horiz.o exchange_horiz_2d.o fft_xy.o init_grid.o \
     51      init_masks.o init_pegrid.o \
    4852      local_flush.o local_stop.o local_system.o message.o \
    4953      modules.o package_parin.o parin.o poisfft.o \
    50       poisfft_hybrid.o singleton.o subsidence.o temperton_fft.o \
     54      poisfft_hybrid.o random_function.o singleton.o subsidence.o temperton_fft.o \
    5155      user_3d_data_averaging.o user_actions.o user_additional_routines.o \
    5256      user_advec_particles.o user_check_data_output.o \
     
    9094close_file.o: modules.o
    9195cpu_log.o: modules.o
     96exchange_horiz.o: modules.o
     97exchange_horiz_2d.o: modules.o
    9298fft_xy.o: modules.o singleton.o temperton_fft.o
    9399init_grid.o: modules.o
     
    101107poisfft.o: modules.o fft_xy.o
    102108poisfft_hybrid.o: modules.o fft_xy.o
     109random_function.o: modules.o
    103110singleton.o: singleton.f90
    104111subsidence.o: modules.o
  • palm/trunk/SOURCE/exchange_horiz.f90

    r710 r841  
    44! Current revisions:
    55! -----------------
    6 !
     6! Excluded routine from compilation of namelist_file_check
    77!
    88! Former revisions:
     
    5959    IMPLICIT NONE
    6060
     61
     62    INTEGER ::  nbgp_local
     63    REAL, DIMENSION(nzb:nzt+1,nys-nbgp_local:nyn+nbgp_local, &
     64                    nxl-nbgp_local:nxr+nbgp_local) ::  ar
     65
     66#if ! defined( __check )
    6167#if defined( __parallel )
    6268    INTEGER, DIMENSION(4)                 ::  req
    6369    INTEGER, DIMENSION(MPI_STATUS_SIZE,4) ::  wait_stat
    6470#endif
    65     INTEGER ::  nbgp_local
    66     REAL, DIMENSION(nzb:nzt+1,nys-nbgp_local:nyn+nbgp_local, &
    67                     nxl-nbgp_local:nxr+nbgp_local) ::  ar
     71
    6872
    6973    CALL cpu_log( log_point_s(2), 'exchange_horiz', 'start' )
     
    187191    CALL cpu_log( log_point_s(2), 'exchange_horiz', 'stop' )
    188192
    189 
     193#endif
    190194 END SUBROUTINE exchange_horiz
  • palm/trunk/SOURCE/exchange_horiz_2d.f90

    r708 r841  
    44! Current revisions:
    55! -----------------
    6 !
     6! Excluded routine from compilation of namelist_file_check
    77!
    88! Former revisions:
     
    4848    IMPLICIT NONE
    4949
     50
    5051    REAL ::  ar(nysg:nyng,nxlg:nxrg)
    5152    INTEGER :: i
    5253
    53 
     54#if ! defined( __check )
    5455    CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'start' )
    5556
     
    146147    CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'stop' )
    147148
     149#endif
    148150 END SUBROUTINE exchange_horiz_2d
    149151
     
    170172    INTEGER :: i
    171173
     174#if ! defined( __check )
    172175    CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'start' )
    173176
     
    239242    CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'stop' )
    240243
     244#endif
    241245 END SUBROUTINE exchange_horiz_2d_int
  • palm/trunk/SOURCE/user_parin.f90

    r554 r841  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: disable max_pr_user check during prior namelist file check
    77!
    88! Former revisions:
     
    8383!-- restart file (already stored in max_pr_user) has to match the one given
    8484!-- for the current run
     85#if ! defined ( __check )
    8586    IF ( TRIM( initializing_actions ) == 'read_restart_data' )  THEN
    8687       IF ( max_pr_user /= max_pr_user_tmp )  THEN
     
    9596       max_pr_user = max_pr_user_tmp
    9697    ENDIF
     98#endif
    9799
    98100100 RETURN
Note: See TracChangeset for help on using the changeset viewer.