Ignore:
Timestamp:
Aug 6, 2019 9:11:47 AM (23 months ago)
Author:
raasch
Message:

relational operators .EQ., .NE., etc. replaced by ==, /=, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/lagrangian_particle_model_mod.f90

    r4143 r4144  
    2525! -----------------
    2626! $Id$
     27! relational operators .EQ., .NE., etc. replaced by ==, /=, etc.
     28!
     29! 4143 2019-08-05 15:14:53Z schwenkel
    2730! Rename variable and change select case to if statement
    2831!
     
    13871390!
    13881391!--                            In case of stretching the actual k index is found iteratively
    1389                                IF ( dz_stretch_level .NE. -9999999.9_wp  .OR.           &
    1390                                     dz_stretch_level_start(1) .NE. -9999999.9_wp )  THEN
     1392                               IF ( dz_stretch_level /= -9999999.9_wp  .OR.           &
     1393                                    dz_stretch_level_start(1) /= -9999999.9_wp )  THEN
    13911394                                  kp = MINLOC( ABS( tmp_particle%z - zu ), DIM = 1 ) - 1
    13921395                               ELSE
     
    16481651!
    16491652!-- Set constants for different aerosol species
    1650     IF ( TRIM(aero_species) .EQ. 'nacl' )  THEN
     1653    IF ( TRIM(aero_species) == 'nacl' )  THEN
    16511654       molecular_weight_of_solute = 0.05844_wp
    16521655       rho_s                      = 2165.0_wp
    16531656       vanthoff                   = 2.0_wp
    1654     ELSEIF ( TRIM(aero_species) .EQ. 'c3h4o4' )  THEN
     1657    ELSEIF ( TRIM(aero_species) == 'c3h4o4' )  THEN
    16551658       molecular_weight_of_solute = 0.10406_wp
    16561659       rho_s                      = 1600.0_wp
    16571660       vanthoff                   = 1.37_wp
    1658     ELSEIF ( TRIM(aero_species) .EQ. 'nh4o3' )  THEN
     1661    ELSEIF ( TRIM(aero_species) == 'nh4o3' )  THEN
    16591662       molecular_weight_of_solute = 0.08004_wp
    16601663       rho_s                      = 1720.0_wp
     
    16681671!-- The following typical aerosol spectra are taken from Jaenicke (1993):
    16691672!-- Tropospheric aerosols. Published in Aerosol-Cloud-Climate Interactions.
    1670     IF ( TRIM(aero_type) .EQ. 'polar' )  THEN
     1673    IF ( TRIM(aero_type) == 'polar' )  THEN
    16711674       na        = (/ 2.17e1, 1.86e-1, 3.04e-4 /) * 1.0E6_wp
    16721675       rm        = (/ 0.0689, 0.375, 4.29 /) * 1.0E-6_wp
    16731676       log_sigma = (/ 0.245, 0.300, 0.291 /)
    1674     ELSEIF ( TRIM(aero_type) .EQ. 'background' )  THEN
     1677    ELSEIF ( TRIM(aero_type) == 'background' )  THEN
    16751678       na        = (/ 1.29e2, 5.97e1, 6.35e1 /) * 1.0E6_wp
    16761679       rm        = (/ 0.0036, 0.127, 0.259 /) * 1.0E-6_wp
    16771680       log_sigma = (/ 0.645, 0.253, 0.425 /)
    1678     ELSEIF ( TRIM(aero_type) .EQ. 'maritime' )  THEN
     1681    ELSEIF ( TRIM(aero_type) == 'maritime' )  THEN
    16791682       na        = (/ 1.33e2, 6.66e1, 3.06e0 /) * 1.0E6_wp
    16801683       rm        = (/ 0.0039, 0.133, 0.29 /) * 1.0E-6_wp
    16811684       log_sigma = (/ 0.657, 0.210, 0.396 /)
    1682     ELSEIF ( TRIM(aero_type) .EQ. 'continental' )  THEN
     1685    ELSEIF ( TRIM(aero_type) == 'continental' )  THEN
    16831686       na        = (/ 3.20e3, 2.90e3, 3.00e-1 /) * 1.0E6_wp
    16841687       rm        = (/ 0.01, 0.058, 0.9 /) * 1.0E-6_wp
    16851688       log_sigma = (/ 0.161, 0.217, 0.380 /)
    1686     ELSEIF ( TRIM(aero_type) .EQ. 'desert' )  THEN
     1689    ELSEIF ( TRIM(aero_type) == 'desert' )  THEN
    16871690       na        = (/ 7.26e2, 1.14e3, 1.78e-1 /) * 1.0E6_wp
    16881691       rm        = (/ 0.001, 0.0188, 10.8 /) * 1.0E-6_wp
    16891692       log_sigma = (/ 0.247, 0.770, 0.438 /)
    1690     ELSEIF ( TRIM(aero_type) .EQ. 'rural' )  THEN
     1693    ELSEIF ( TRIM(aero_type) == 'rural' )  THEN
    16911694       na        = (/ 6.65e3, 1.47e2, 1.99e3 /) * 1.0E6_wp
    16921695       rm        = (/ 0.00739, 0.0269, 0.0419 /) * 1.0E-6_wp
    16931696       log_sigma = (/ 0.225, 0.557, 0.266 /)
    1694     ELSEIF ( TRIM(aero_type) .EQ. 'urban' )  THEN
     1697    ELSEIF ( TRIM(aero_type) == 'urban' )  THEN
    16951698       na        = (/ 9.93e4, 1.11e3, 3.64e4 /) * 1.0E6_wp
    16961699       rm        = (/ 0.00651, 0.00714, 0.0248 /) * 1.0E-6_wp
    16971700       log_sigma = (/ 0.245, 0.666, 0.337 /)
    1698     ELSEIF ( TRIM(aero_type) .EQ. 'user' )  THEN
     1701    ELSEIF ( TRIM(aero_type) == 'user' )  THEN
    16991702       CONTINUE
    17001703    ELSE
     
    17391742
    17401743                IF ( particles(n)%weight_factor - FLOOR(particles(n)%weight_factor,KIND=wp) &
    1741                      .GT. random_function( iran_part ) )  THEN
     1744                     > random_function( iran_part ) )  THEN
    17421745                   particles(n)%weight_factor = FLOOR(particles(n)%weight_factor,KIND=wp) + 1.0_wp
    17431746                ELSE
     
    17461749!
    17471750!--             Unnecessary particles will be deleted
    1748                 IF ( particles(n)%weight_factor .LE. 0.0_wp )  particles(n)%particle_mask = .FALSE.
     1751                IF ( particles(n)%weight_factor <= 0.0_wp )  particles(n)%particle_mask = .FALSE.
    17491752
    17501753             ENDDO
     
    51035106   !--          Check error of the solution, and reduce dt_ros if necessary.
    51045107                error = ABS(r_err - r_ros) / r_ros
    5105                 IF ( error .GT. prec )  THEN
     5108                IF ( error > prec )  THEN
    51065109                   dt_ros = SQRT( q_decrease * prec / error ) * dt_ros
    51075110                   r_ros  = r_ros_ini
     
    54045407!--          For collisions, the weighting factor of at least one super-droplet
    54055408!--          needs to be larger or equal to one.
    5406              IF ( MIN( weight(n), weight(m) ) .LT. 1.0_wp )  CYCLE
     5409             IF ( MIN( weight(n), weight(m) ) < 1.0_wp )  CYCLE
    54075410!
    54085411!--          Get mass of individual droplets (aerosols)
     
    54295432!--          (Accordingly, p_crit will be 0.0, 1.0, 2.0, ...)
    54305433             IF ( collection_probability - FLOOR(collection_probability)    &
    5431                   .GT. random_function( iran_part ) )  THEN
     5434                  > random_function( iran_part ) )  THEN
    54325435                collection_probability = FLOOR(collection_probability) + 1.0_wp
    54335436             ELSE
     
    54355438             ENDIF
    54365439
    5437              IF ( collection_probability .GT. 0.0_wp )  THEN
     5440             IF ( collection_probability > 0.0_wp )  THEN
    54385441!
    54395442!--             Super-droplet n collects droplets of super-droplet m
    5440                 IF ( weight(n) .LT. weight(m) )  THEN
     5443                IF ( weight(n) < weight(m) )  THEN
    54415444
    54425445                   mass(n)   = mass(n)   + weight(n) * xm * collection_probability
     
    54485451                   ENDIF
    54495452
    5450                 ELSEIF ( weight(m) .LT. weight(n) )  THEN
     5453                ELSEIF ( weight(m) < weight(n) )  THEN
    54515454
    54525455                   mass(m)   = mass(m)   + weight(m) * xn * collection_probability
     
    76157618!
    76167619!--    In case of stretching the actual k index must be found
    7617        IF ( dz_stretch_level .NE. -9999999.9_wp  .OR.         &
    7618             dz_stretch_level_start(1) .NE. -9999999.9_wp )  THEN
     7620       IF ( dz_stretch_level /= -9999999.9_wp  .OR.         &
     7621            dz_stretch_level_start(1) /= -9999999.9_wp )  THEN
    76197622          kp = MINLOC( ABS( particle_array(n)%z - zu ), DIM = 1 ) - 1
    76207623       ELSE
Note: See TracChangeset for help on using the changeset viewer.