Changeset 841
- Timestamp:
- Feb 28, 2012 12:29:49 PM (13 years ago)
- Location:
- palm/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SCRIPTS/mrun
r838 r841 250 250 # 22/02/12 - Siggi - -s info updated 251 251 # 22/02/12 - Siggi - case "-s WP" removed 252 # 28/02/12 - BjornM - further adjustments for namelist file check 252 253 253 254 … … 2362 2363 2363 2364 #### 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" 2364 2369 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 2365 2379 if [[ $check_namelist_files == false || $fromhost != $localhost || $run_coupled_model == true || $restart_run == true ]] 2366 2380 then … … 2421 2435 printf "\n +++ no PARIN list entry found for d3f in the configuration file." 2422 2436 fi 2437 2423 2438 # GET TOPOGRAPHY PARAMETER FILE SUFFIX (USUALLY "_P3DF"). THIS FILE MIGHT IS 2424 2439 # NOT NECESSARILY REQUIRED … … 2442 2457 2443 2458 rm -rf ${working_directory}/tmp_check 2444 2445 # DEFINE VARIABLES FOR FREQUENTLY USED DIRECTORIES2446 check_depository="${working_directory}/trunk/UTIL"2447 check_sources="${working_directory}/tmp_check_namelist_files"2448 2459 2449 2460 # CHECK IF THE A P3DF FILE MUST BE CHECKED -
palm/trunk/SOURCE/Makefile_check
r819 r841 4 4 # Current revisions: 5 5 # ------------------ 6 # Added: exchange_horiz, exchange_horiz_2d, random_function 6 7 # 7 8 # Former revisions: … … 25 26 26 27 RCS = 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 \ 28 30 init_pegrid.f90 local_flush.f90 local_stop.f90 local_system.f90 \ 29 31 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 \ 31 34 user_3d_data_averaging.f90 user_actions.f90 \ 32 35 user_additional_routines.f90 user_advec_particles.f90 \ … … 45 48 46 49 OBJS = 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 \ 48 52 local_flush.o local_stop.o local_system.o message.o \ 49 53 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 \ 51 55 user_3d_data_averaging.o user_actions.o user_additional_routines.o \ 52 56 user_advec_particles.o user_check_data_output.o \ … … 90 94 close_file.o: modules.o 91 95 cpu_log.o: modules.o 96 exchange_horiz.o: modules.o 97 exchange_horiz_2d.o: modules.o 92 98 fft_xy.o: modules.o singleton.o temperton_fft.o 93 99 init_grid.o: modules.o … … 101 107 poisfft.o: modules.o fft_xy.o 102 108 poisfft_hybrid.o: modules.o fft_xy.o 109 random_function.o: modules.o 103 110 singleton.o: singleton.f90 104 111 subsidence.o: modules.o -
palm/trunk/SOURCE/exchange_horiz.f90
r710 r841 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Excluded routine from compilation of namelist_file_check 7 7 ! 8 8 ! Former revisions: … … 59 59 IMPLICIT NONE 60 60 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 ) 61 67 #if defined( __parallel ) 62 68 INTEGER, DIMENSION(4) :: req 63 69 INTEGER, DIMENSION(MPI_STATUS_SIZE,4) :: wait_stat 64 70 #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 68 72 69 73 CALL cpu_log( log_point_s(2), 'exchange_horiz', 'start' ) … … 187 191 CALL cpu_log( log_point_s(2), 'exchange_horiz', 'stop' ) 188 192 189 193 #endif 190 194 END SUBROUTINE exchange_horiz -
palm/trunk/SOURCE/exchange_horiz_2d.f90
r708 r841 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Excluded routine from compilation of namelist_file_check 7 7 ! 8 8 ! Former revisions: … … 48 48 IMPLICIT NONE 49 49 50 50 51 REAL :: ar(nysg:nyng,nxlg:nxrg) 51 52 INTEGER :: i 52 53 53 54 #if ! defined( __check ) 54 55 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'start' ) 55 56 … … 146 147 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'stop' ) 147 148 149 #endif 148 150 END SUBROUTINE exchange_horiz_2d 149 151 … … 170 172 INTEGER :: i 171 173 174 #if ! defined( __check ) 172 175 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'start' ) 173 176 … … 239 242 CALL cpu_log( log_point_s(13), 'exchange_horiz_2d', 'stop' ) 240 243 244 #endif 241 245 END SUBROUTINE exchange_horiz_2d_int -
palm/trunk/SOURCE/user_parin.f90
r554 r841 4 4 ! Current revisions: 5 5 ! ----------------- 6 ! 6 ! Bugfix: disable max_pr_user check during prior namelist file check 7 7 ! 8 8 ! Former revisions: … … 83 83 !-- restart file (already stored in max_pr_user) has to match the one given 84 84 !-- for the current run 85 #if ! defined ( __check ) 85 86 IF ( TRIM( initializing_actions ) == 'read_restart_data' ) THEN 86 87 IF ( max_pr_user /= max_pr_user_tmp ) THEN … … 95 96 max_pr_user = max_pr_user_tmp 96 97 ENDIF 98 #endif 97 99 98 100 100 RETURN
Note: See TracChangeset
for help on using the changeset viewer.