Changeset 3467 for palm/trunk/SOURCE/check_parameters.f90
- Timestamp:
- Oct 30, 2018 7:05:21 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE
-
palm/trunk/SOURCE/check_parameters.f90
- Property svn:mergeinfo changed
/palm/branches/salsa/SOURCE/check_parameters.f90 (added) merged: 2505,2525-2526,2561,2607,2708,2730,2738,2744,2748,2777,2814,2832,2838,2869,3005,3064,3104,3169,3211,3308,3331,3412
r3454 r3467 20 20 ! Current revisions: 21 21 ! ----------------- 22 ! 22 ! 23 ! 2017-10-10 11:29:14Z monakurppa 24 ! Implementation of a new aerosol module salsa. 23 25 ! 24 26 ! Former revisions: … … 781 783 ONLY: radiation, radiation_check_data_output, & 782 784 radiation_check_data_output_pr, radiation_check_parameters 785 786 USE salsa_mod, & 787 ONLY: salsa, salsa_check_data_output, salsa_check_parameters 783 788 784 789 USE spectra_mod, & … … 1514 1519 !-- Checks for surface data output 1515 1520 IF ( surface_data_output ) CALL surface_output_check_parameters 1521 ! 1522 !-- When SALSA is used, perform additional checks 1523 IF ( salsa ) CALL salsa_check_parameters 1516 1524 1517 1525 ! … … 3214 3222 ENDIF 3215 3223 3224 IF ( unit == 'illegal' .AND. salsa ) THEN 3225 CALL salsa_check_data_output( var, unit ) 3226 ENDIF 3227 3216 3228 IF ( unit == 'illegal' .AND. urban_surface & 3217 3229 .AND. var(1:4) == 'usm_' ) THEN - Property svn:mergeinfo changed
Note: See TracChangeset
for help on using the changeset viewer.