Changeset 845


Ignore:
Timestamp:
Mar 7, 2012 10:23:05 AM (10 years ago)
Author:
maronga
Message:

Bugfixes for namelist file check

Location:
palm/trunk/SOURCE
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/Makefile_check

    r842 r845  
    44# Current revisions:
    55# ------------------
    6 #
     6# Added init_cloud_physics
    77#
    88# Former revisions:
     
    3030RCS = check_open.f90 check_namelist_files.f90 check_parameters.f90 \
    3131      close_file.f90 cpu_log.f90 exchange_horiz.f90 exchange_horiz_2d.f90 \
    32       fft_xy.f90 init_grid.f90 init_masks.f90 \
     32      fft_xy.f90 init_grid.f90 init_masks.f90 init_cloud_physics.f90 \
    3333      init_pegrid.f90 local_flush.f90 local_stop.f90 local_system.f90 \
    3434      message.f90 modules.f90 package_parin.f90 parin.f90 poisfft.f90 \
     
    5252OBJS = check_open.o check_namelist_files.o check_parameters.o close_file.o \
    5353      cpu_log.o exchange_horiz.o exchange_horiz_2d.o fft_xy.o init_grid.o \
    54       init_masks.o init_pegrid.o \
     54      init_masks.o init_pegrid.o init_cloud_physics.o\
    5555      local_flush.o local_stop.o local_system.o message.o \
    5656      modules.o package_parin.o parin.o poisfft.o \
     
    100100exchange_horiz_2d.o: modules.o
    101101fft_xy.o: modules.o singleton.o temperton_fft.o
     102init_cloud_physics.o: modules.o
    102103init_grid.o: modules.o
    103104init_masks.o: modules.o
  • palm/trunk/SOURCE/check_namelist_files.f90

    r818 r845  
    44! Current revisions:
    55! -----------------
    6 !
     6! Added call to init_cloud_physics
    77!
    88! Former revisions:
     
    4848    CALL init_grid
    4949
    50 
     50!
    5151!-- Check control parameters and deduce further quantities   
    5252    CALL check_parameters
    5353
    54 
     54!
     55!-- Check absolute temperature and pressure. Delete this call in case that
     56!-- init_3d_model is compiled for the parameter file check
     57    CALL init_cloud_physics
    5558
    5659 END PROGRAM check_namelist_files
  • palm/trunk/SOURCE/check_parameters.f90

    r829 r845  
    44! Current revisions:
    55! -----------------
    6 !
     6! Bugfix: exclude __netcdf4 directive part from namelist file check compilation
    77!
    88! Former revisions:
     
    231231#if defined( __parallel )
    232232
    233 #if defined( __check )
    234 
    235233!
    236234!--    NOTE: coupled runs have not been implemented in the check_namelist_files
     
    238236!--    check_namelist_files will need the following information of the other
    239237!--    model (atmosphere/ocean).
    240        dt_coupling = remote
    241        dt_max = remote
    242        restart_time = remote
    243        dt_restart= remote
    244        simulation_time_since_reference = remote
    245        dx = remote
    246 
    247 #endif
     238!       dt_coupling = remote
     239!       dt_max = remote
     240!       restart_time = remote
     241!       dt_restart= remote
     242!       simulation_time_since_reference = remote
     243!       dx = remote
     244
    248245
    249246#if ! defined( __check )
     
    29872984!-- Check the NetCDF data format
    29882985    IF ( netcdf_data_format > 2 )  THEN
    2989 #if defined( __netcdf4 )
     2986#if defined( __netcdf4 ) && ! defined ( __check )
    29902987       CONTINUE
    29912988#else
Note: See TracChangeset for help on using the changeset viewer.