Ignore:
Timestamp:
Dec 4, 2009 5:05:40 PM (15 years ago)
Author:
letzel
Message:
  • reintegrate branch letzel/masked_output into trunk; new funtionality: masked data output (not yet documented)
Location:
palm/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk

    • Property svn:mergeinfo set to False
      /palm/branches/letzel/masked_output296-409
  • palm/trunk/SOURCE/check_parameters.f90

    r407 r410  
    55! -----------------
    66! Enabled passive scalar/humidity wall fluxes for non-flat topography
     7!
     8! Branch revisions:
     9! -----------------
     10! Masked data output
    711!
    812! Former revisions:
     
    14771481       IF ( dt_do3d           == 9999999.9 )  dt_do3d           = dt_data_output
    14781482       IF ( dt_data_output_av == 9999999.9 )  dt_data_output_av = dt_data_output
     1483       DO  mid = 1, 20
     1484          IF ( dt_domask(mid) == 9999999.9 )  dt_domask(mid)    = dt_data_output
     1485       ENDDO
    14791486    ENDIF
    14801487
     
    14951502    IF ( skip_time_data_output_av == 9999999.9 ) &
    14961503                                skip_time_data_output_av = skip_time_data_output
     1504    DO  mid = 1, 20
     1505       IF ( skip_time_domask(mid) == 9999999.9 ) &
     1506                                skip_time_domask(mid)    = skip_time_data_output
     1507    ENDDO
    14971508
    14981509!
     
    26472658
    26482659!
     2660!-- Check mask conditions
     2661    IF ( masks < 0 .OR. masks > max_masks )  THEN
     2662       WRITE( message_string, * )  'illegal value: masks must be >= 0 and ', &
     2663            '<= ', max_masks, ' (=max_masks)'
     2664       CALL message( 'check_parameters', 'PA9998', 1, 2, 0, 6, 0 )
     2665    ENDIF
     2666    IF ( masks > 0 )  THEN
     2667       mask_scale(1) = mask_scale_x
     2668       mask_scale(2) = mask_scale_y
     2669       mask_scale(3) = mask_scale_z
     2670       IF ( ANY( mask_scale <= 0.0 ) )  THEN
     2671          WRITE( message_string, * )  &
     2672               'illegal value: mask_scale_x, mask_scale_y and mask_scale_z', &
     2673               'must be > 0.0'
     2674          CALL message( 'check_parameters', 'PA9998', 1, 2, 0, 6, 0 )
     2675       ENDIF
     2676!
     2677!--    Generate masks for masked data output
     2678       CALL init_masks
     2679    ENDIF
     2680
     2681!
    26492682!-- Check netcdf precison
    26502683    ldum = .FALSE.
Note: See TracChangeset for help on using the changeset viewer.