Ignore:
Timestamp:
Sep 23, 2009, 4:47:40 PM (15 years ago)
Author:
Laurent Fairhead
Message:
  • En deconnectant les aérosols (ok_ade=ok_aie=n) on a les mêmes

résultats avant et après les modifs.

  • preindustrial readin fields are used to compute natural aerosol fields

to allow for clean double calls to radiation

  • full forcing diagnostics (NAT, ANT, ZERO, Cloud forcing, CS,AS) are

activated with lev_histmth 4, If lev_histmth is not 4, the call to the
radiation is minimized, for efficiency, but ade and aie are computed and
applied (however for species wise forcing one would need to do
difference runs) (still quite a bit new forcing info, requires probably

some more explanation)

  • there is a hardcoded key in sw_aeroAR4.F90 which lets you choose to use the zero aerosol, or natural aerosol perturbation acting on the meteorology, but still would put out the full forcing diagnostics.
  • aod fields from offline aerosol fields are also output in histmth for

all aerosol tracers read in and available for evaluation

  • aeropt contains the ss humidity correction from nicolas&yves
File:
1 edited

Legend:

Unmodified
Added
Removed

  • LMDZ4/branches/LMDZ4-dev/libf/phylmd/aeropt_5wv.F90

    r1237 r1246  
    1111  USE DIMPHY
    1212  USE aero_mod
    13   USE mod_phys_lmdz_para, ONLY : mpi_rank
     13
    1414  !
    1515  !    Yves Balkanski le 12 avril 2006
    … …  
    8484  INTEGER, PARAMETER :: nbre_RH=12
    8585  INTEGER, PARAMETER :: naero_soluble=7   !  1- BC soluble; 2- POM soluble; 3- SO4 acc.
    86                                           ! 4- SO4 coarse; 5 seasalt super-C; 6 seasalt coarse; 7 seasalt acc.
     86                                          !  4- SO4 coarse; 5 seasalt super-C; 6 seasalt coarse; 7 seasalt acc.
    8787  INTEGER, PARAMETER :: naero_insoluble=3 !  1- Dust; 2- BC insoluble; 3- POM insoluble
    88   INTEGER, PARAMETER :: nb_level = 19 ! number of vertical levels
     88  INTEGER, PARAMETER :: nb_level = 19     ! number of vertical levels
    8989  LOGICAL, SAVE :: firstcall=.TRUE.
    9090
    … …  
    281281!*********************************************************************
    282282!
    283   !
    284   !
    285   !
    286   ! From here on we look at the optical parameters at 5 wavelengths:
    287   ! 443nm, 550, 670, 765 and 865 nm
    288   !                                   le 12 AVRIL 2006
    289   !
    290  DATA alpha_aers_5wv/ &
    291                                 ! bc soluble
    292        7.930,7.930,7.930,7.930,7.930,7.930,     &
    293        7.930,7.930,10.893,12.618,14.550,16.613, &
    294        7.658,7.658,7.658,7.658,7.658,7.658,     &
    295        7.658,7.658,10.351,11.879,13.642,15.510, &
    296        7.195,7.195,7.195,7.195,7.195,7.195,     &
    297        7.195,7.195,9.551,10.847,12.381,13.994,  &
    298        6.736,6.736,6.736,6.736,6.736,6.736,     &
    299        6.736,6.736,8.818,9.938,11.283,12.687,   &
    300        6.277,6.277,6.277,6.277,6.277,6.277,     &
    301        6.277,6.277,8.123,9.094,10.275,11.501,   &
    302                                 ! pom soluble
    303        6.676,6.676,6.676,6.676,6.710,6.934,   &
    304        7.141,7.569,8.034,8.529,9.456,10.511,  &
    305        5.109,5.109,5.109,5.109,5.189,5.535,   &
    306        5.960,6.852,8.008,9.712,12.897,19.676, &
    307        3.718,3.718,3.718,3.718,3.779,4.042,   &
    308        4.364,5.052,5.956,7.314,9.896,15.688,  &
    309        2.849,2.849,2.849,2.849,2.897,3.107,   &
    310        3.365,3.916,4.649,5.760,7.900,12.863,  &
    311        2.229,2.229,2.229,2.229,2.268,2.437,   &
    312        2.645,3.095,3.692,4.608,6.391,10.633,  &
    313                                 ! Sulfate (Accumulation)
    314        5.751,6.215,6.690,7.024,7.599,8.195,      &
    315        9.156,10.355,12.660,14.823,18.908,24.508, &
    316        4.320,4.675,5.052,5.375,5.787,6.274,      &
    317        7.066,8.083,10.088,12.003,15.697,21.133,  &
    318        3.079,3.351,3.639,3.886,4.205,4.584,      &
    319        5.206,6.019,7.648,9.234,12.391,17.220,    &
    320        2.336,2.552,2.781,2.979,3.236,3.540,      &
    321        4.046,4.711,6.056,7.388,10.093,14.313,    &
    322        1.777,1.949,2.134,2.292,2.503,2.751,      &
    323        3.166,3.712,4.828,5.949,8.264,11.922,     &
    324                                 ! Sulfate (Coarse)
    325        5.751,6.215,6.690,7.024,7.599,8.195,      &
    326        9.156,10.355,12.660,14.823,18.908,24.508, &
    327        4.320,4.675,5.052,5.375,5.787,6.274,      &
    328        7.066,8.083,10.088,12.003,15.697,21.133,  &
    329        3.079,3.351,3.639,3.886,4.205,4.584,      &
    330        5.206,6.019,7.648,9.234,12.391,17.220,    &
    331        2.336,2.552,2.781,2.979,3.236,3.540,      &
    332        4.046,4.711,6.056,7.388,10.093,14.313,    &
    333        1.777,1.949,2.134,2.292,2.503,2.751,      &
    334        3.166,3.712,4.828,5.949,8.264,11.922,     &
    335                                 ! Seasalt soluble super_coarse (computed below for 550nm)
    336        0.50,0.90,1.05,1.21,1.40,2.41, &
    337        2.66,3.11,3.88,4.52,5.69,8.84, &
    338        0.000,0.000,0.000,0.000,0.000,0.000, &
    339        0.000,0.000,0.000,0.000,0.000,0.000, &
    340      0.52,0.93,1.08,1.24,1.43,2.47, &
    341      2.73,3.20,3.99,4.64,5.84,9.04, &
    342      0.52,0.93,1.09,1.25,1.44,2.50, &
    343      2.76,3.23,4.03,4.68,5.89,9.14, &
    344      0.52,0.94,1.09,1.26,1.45,2.51, &
    345      2.78,3.25,4.06,4.72,5.94,9.22, &
    346                                 ! seasalt soluble coarse (computed below for 550nm)
    347        0.50,0.90,1.05,1.21,1.40,2.41, &
    348        2.66,3.11,3.88,4.52,5.69,8.84, &
    349        0.000,0.000,0.000,0.000,0.000,0.000, &
    350        0.000,0.000,0.000,0.000,0.000,0.000, &
    351      0.52,0.93,1.08,1.24,1.43,2.47, &
    352      2.73,3.20,3.99,4.64,5.84,9.04, &
    353      0.52,0.93,1.09,1.25,1.44,2.50, &
    354      2.76,3.23,4.03,4.68,5.89,9.14, &
    355      0.52,0.94,1.09,1.26,1.45,2.51, &
    356      2.78,3.25,4.06,4.72,5.94,9.22, &
    357                                 ! seasalt soluble accumulation (computed below for 550nm)
    358      4.28, 7.17, 8.44, 9.85,11.60,22.44,  &
    359      25.34,30.54,39.38,46.52,59.33,91.77, &
    360        0.000,0.000,0.000,0.000,0.000,0.000, &
    361        0.000,0.000,0.000,0.000,0.000,0.000, &
    362      2.48, 4.22, 5.02, 5.94, 7.11,15.29,  &
    363      17.70,22.31,30.73,38.06,52.15,90.59, &
    364      1.90, 3.29, 3.94, 4.69, 5.65, 12.58, &
    365      14.68,18.77,26.41,33.25,46.77,85.50, &
    366      1.47, 2.59, 3.12, 3.74, 4.54, 10.42, &
    367      12.24,15.82,22.66,28.91,41.54,79.33/
     283!
     284!
     285!
     286! From here on we look at the optical parameters at 5 wavelengths:
     287! 443nm, 550, 670, 765 and 865 nm
     288!                                   le 12 AVRIL 2006
     289!
     290  DATA alpha_aers_5wv/ &
     291     ! bc soluble
     292     7.930,7.930,7.930,7.930,7.930,7.930,     &
     293     7.930,7.930,10.893,12.618,14.550,16.613, &
     294     7.658,7.658,7.658,7.658,7.658,7.658,     &
     295     7.658,7.658,10.351,11.879,13.642,15.510, &
     296     7.195,7.195,7.195,7.195,7.195,7.195,     &
     297     7.195,7.195,9.551,10.847,12.381,13.994,  &
     298     6.736,6.736,6.736,6.736,6.736,6.736,     &
     299     6.736,6.736,8.818,9.938,11.283,12.687,   &
     300     6.277,6.277,6.277,6.277,6.277,6.277,     &
     301     6.277,6.277,8.123,9.094,10.275,11.501,   &
     302     ! pom soluble
     303     6.676,6.676,6.676,6.676,6.710,6.934,   &
     304     7.141,7.569,8.034,8.529,9.456,10.511,  &
     305     5.109,5.109,5.109,5.109,5.189,5.535,   &
     306     5.960,6.852,8.008,9.712,12.897,19.676, &
     307     3.718,3.718,3.718,3.718,3.779,4.042,   &
     308     4.364,5.052,5.956,7.314,9.896,15.688,  &
     309     2.849,2.849,2.849,2.849,2.897,3.107,   &
     310     3.365,3.916,4.649,5.760,7.900,12.863,  &
     311     2.229,2.229,2.229,2.229,2.268,2.437,   &
     312     2.645,3.095,3.692,4.608,6.391,10.633,  &
     313     ! Sulfate
     314     5.751,6.215,6.690,7.024,7.599,8.195,      &
     315     9.156,10.355,12.660,14.823,18.908,24.508, &
     316     4.320,4.675,5.052,5.375,5.787,6.274,      &
     317     7.066,8.083,10.088,12.003,15.697,21.133,  &
     318     3.079,3.351,3.639,3.886,4.205,4.584,      &
     319     5.206,6.019,7.648,9.234,12.391,17.220,    &
     320     2.336,2.552,2.781,2.979,3.236,3.540,      &
     321     4.046,4.711,6.056,7.388,10.093,14.313,    &
     322     1.777,1.949,2.134,2.292,2.503,2.751,      &
     323     3.166,3.712,4.828,5.949,8.264,11.922/
    368324
    369325  DATA alpha_aeri_5wv/ &
    370                                 ! dust insoluble
    371        0.759, 0.770, 0.775, 0.775, 0.772, &
    372                                 !!jb bc insoluble
    373        11.536,10.033, 8.422, 7.234, 6.270, &
    374                                 ! pom insoluble
    375        5.042, 3.101, 1.890, 1.294, 0.934/
    376   !
    377  DATA cg_aers_5wv/ &
    378                                 ! bc soluble
    379        .651, .651, .651, .651, .651, .651, &
    380        .651, .651, .738, .764, .785, .800, &
    381        .597, .597, .597, .597, .597, .597, &
    382        .597, .597, .695, .725, .751, .770, &
    383        .543, .543, .543, .543, .543, .543, &
    384        .543, .543, .650, .684, .714, .736, &
    385        .504, .504, .504, .504, .504, .504, &
    386        .504, .504, .614, .651, .683, .708, &
    387        .469, .469, .469, .469, .469, .469, &
    388        .469, .469, .582, .620, .655, .681, &
    389                                 ! pom soluble
    390        .679, .679, .679, .679, .683, .691, &
    391        .703, .720, .736, .751, .766, .784, &
    392        .656, .656, .656, .656, .659, .669, &
    393        .681, .699, .717, .735, .750, .779, &
    394        .623, .623, .623, .623, .627, .637, &
    395        .649, .668, .688, .709, .734, .762, &
    396        .592, .592, .592, .592, .595, .605, &
    397        .618, .639, .660, .682, .711, .743, &
    398        .561, .561, .561, .561, .565, .575, &
    399        .588, .609, .632, .656, .688, .724, &
    400                                 ! Accumulation sulfate
    401        .671, .684, .697, .704, .714, .723, &
    402        .734, .746, .762, .771, .781, .789, &
    403        .653, .666, .678, .687, .697, .707, &
    404        .719, .732, .751, .762, .775, .789, &
    405        .622, .635, .648, .657, .667, .678, &
    406        .691, .705, .728, .741, .758, .777, &
    407        .591, .604, .617, .627, .638, .650, &
    408        .664, .679, .704, .719, .739, .761, &
    409        .560, .574, .587, .597, .609, .621, &
    410        .637, .653, .680, .697, .719, .745, &
    411                                 ! Coarse sulfate
    412        .671, .684, .697, .704, .714, .723, &
    413        .734, .746, .762, .771, .781, .789, &
    414        .653, .666, .678, .687, .697, .707, &
    415        .719, .732, .751, .762, .775, .789, &
    416        .622, .635, .648, .657, .667, .678, &
    417        .691, .705, .728, .741, .758, .777, &
    418        .591, .604, .617, .627, .638, .650, &
    419        .664, .679, .704, .719, .739, .761, &
    420        .560, .574, .587, .597, .609, .621, &
    421        .637, .653, .680, .697, .719, .745, &
    422                                 ! For super coarse seasalt (computed below for 550nm!)
    423       0.730,0.753,0.760,0.766,0.772,0.793, &
    424       0.797,0.802,0.809,0.813,0.820,0.830, &
    425        0.000,0.000,0.000,0.000,0.000,0.000, &
    426        0.000,0.000,0.000,0.000,0.000,0.000, &
    427      0.721,0.744,0.750,0.756,0.762,0.784, &
    428      0.787,0.793,0.800,0.804,0.811,0.822, &
    429      0.717,0.741,0.747,0.753,0.759,0.780, &
    430      0.784,0.789,0.795,0.800,0.806,0.817, &
    431      0.715,0.739,0.745,0.751,0.757,0.777, & 
    432      0.781,0.786,0.793,0.797,0.803,0.814, &
    433                                 ! For coarse-soluble seasalt (computed below for 550nm!)
    434      0.730,0.753,0.760,0.766,0.772,0.793, &
    435      0.797,0.802,0.809,0.813,0.820,0.830, &
    436        0.000,0.000,0.000,0.000,0.000,0.000, &
    437        0.000,0.000,0.000,0.000,0.000,0.000, &
    438      0.721,0.744,0.750,0.756,0.762,0.784, &
    439      0.787,0.793,0.800,0.804,0.811,0.822, &
    440      0.717,0.741,0.747,0.753,0.759,0.780, &
    441      0.784,0.789,0.795,0.800,0.806,0.817, &
    442      0.715,0.739,0.745,0.751,0.757,0.777, & 
    443      0.781,0.786,0.793,0.797,0.803,0.814, &
    444                                 ! accumulation-seasalt soluble (computed below for 550nm!)
    445      0.698,0.722,0.729,0.736,0.743,0.765, &
    446      0.768,0.773,0.777,0.779,0.781,0.779, &
    447        0.000,0.000,0.000,0.000,0.000,0.000, &
    448        0.000,0.000,0.000,0.000,0.000,0.000, &
    449      0.658,0.691,0.701,0.710,0.720,0.756, &
    450      0.763,0.771,0.782,0.788,0.795,0.801, &
    451      0.632,0.668,0.679,0.690,0.701,0.743, &
    452      0.750,0.762,0.775,0.783,0.792,0.804, &
    453      0.605,0.644,0.656,0.669,0.681,0.729, &
    454      0.737,0.750,0.765,0.775,0.787,0.803/
     326     ! dust insoluble
     327     0.759, 0.770, 0.775, 0.775, 0.772, &
     328     !!jb bc insoluble
     329     11.536,10.033, 8.422, 7.234, 6.270, &
     330     ! pom insoluble
     331     5.042, 3.101, 1.890, 1.294, 0.934/
     332
     333  DATA cg_aers_5wv/ &
     334     ! bc soluble
     335     .651, .651, .651, .651, .651, .651, &
     336     .651, .651, .738, .764, .785, .800, &
     337     .597, .597, .597, .597, .597, .597, &
     338     .597, .597, .695, .725, .751, .770, &
     339     .543, .543, .543, .543, .543, .543, &
     340     .543, .543, .650, .684, .714, .736, &
     341     .504, .504, .504, .504, .504, .504, &
     342     .504, .504, .614, .651, .683, .708, &
     343     .469, .469, .469, .469, .469, .469, &
     344     .469, .469, .582, .620, .655, .681, &
     345     ! pom soluble
     346     .679, .679, .679, .679, .683, .691, &
     347     .703, .720, .736, .751, .766, .784, &
     348     .656, .656, .656, .656, .659, .669, &
     349     .681, .699, .717, .735, .750, .779, &
     350     .623, .623, .623, .623, .627, .637, &
     351     .649, .668, .688, .709, .734, .762, &
     352     .592, .592, .592, .592, .595, .605, &
     353     .618, .639, .660, .682, .711, .743, &
     354     .561, .561, .561, .561, .565, .575, &
     355     .588, .609, .632, .656, .688, .724, &
     356     ! sulfate
     357     .671, .684, .697, .704, .714, .723, &
     358     .734, .746, .762, .771, .781, .789, &
     359     .653, .666, .678, .687, .697, .707, &
     360     .719, .732, .751, .762, .775, .789, &
     361     .622, .635, .648, .657, .667, .678, &
     362     .691, .705, .728, .741, .758, .777, &
     363     .591, .604, .617, .627, .638, .650, &
     364     .664, .679, .704, .719, .739, .761, &
     365     .560, .574, .587, .597, .609, .621, &
     366     .637, .653, .680, .697, .719, .745/
     367  !
    455368
    456369  DATA cg_aeri_5wv/&
    … …  
    463376  !
    464377  DATA piz_aers_5wv/&
    465                                 ! bc soluble
    466        .445, .445, .445, .445, .445, .445, &
    467        .445, .445, .470, .487, .508, .531, &
    468        .442, .442, .442, .442, .442, .442, &
    469        .442, .442, .462, .481, .506, .533, &
    470        .427, .427, .427, .427, .427, .427, &
    471        .427, .427, .449, .470, .497, .526, &
    472        .413, .413, .413, .413, .413, .413, &
    473        .413, .413, .437, .458, .486, .516, &
    474        .399, .399, .399, .399, .399, .399, &
    475        .399, .399, .423, .445, .473, .506, &
    476                                 ! pom soluble
    477        .975, .975, .975, .975, .975, .977, &
    478        .979, .982, .984, .987, .990, .994, &
    479        .972, .972, .972, .972, .973, .974, &
    480        .977, .980, .983, .986, .989, .993, &
    481        .963, .963, .963, .963, .964, .966, &
    482        .969, .974, .977, .982, .986, .991, &
    483        .955, .955, .955, .955, .955, .958, &
    484        .962, .967, .972, .977, .983, .989, &
    485        .944, .944, .944, .944, .944, .948, &
    486        .952, .959, .962, .972, .979, .987, &
    487                                 ! sulfate soluble accumulation
    488        1.000,1.000,1.000,1.000,1.000,1.000, &
    489        1.000,1.000,1.000,1.000,1.000,1.000, &
    490        1.000,1.000,1.000,1.000,1.000,1.000, &
    491        1.000,1.000,1.000,1.000,1.000,1.000, &
    492        1.000,1.000,1.000,1.000,1.000,1.000, &
    493        1.000,1.000,1.000,1.000,1.000,1.000, &
    494        1.000,1.000,1.000,1.000,1.000,1.000, &
    495        1.000,1.000,1.000,1.000,1.000,1.000, &
    496        1.000,1.000,1.000,1.000,1.000,1.000, &
    497        1.000,1.000,1.000,1.000,1.000,1.000, &
    498                                 ! sulfate soluble coarse
    499        1.000,1.000,1.000,1.000,1.000,1.000, &
    500        1.000,1.000,1.000,1.000,1.000,1.000, &
    501        1.000,1.000,1.000,1.000,1.000,1.000, &
    502        1.000,1.000,1.000,1.000,1.000,1.000, &
    503        1.000,1.000,1.000,1.000,1.000,1.000, &
    504        1.000,1.000,1.000,1.000,1.000,1.000, &
    505        1.000,1.000,1.000,1.000,1.000,1.000, &
    506        1.000,1.000,1.000,1.000,1.000,1.000, &
    507        1.000,1.000,1.000,1.000,1.000,1.000, &
    508        1.000,1.000,1.000,1.000,1.000,1.000, &
    509                                 ! seasalt super coarse (computed below for 550nm)
    510        1.000,1.000,1.000,1.000,1.000,1.000, &
    511        1.000,1.000,1.000,1.000,1.000,1.000, &
    512        1.000,1.000,1.000,1.000,1.000,1.000, &
    513        1.000,1.000,1.000,1.000,1.000,1.000, &
    514        1.000,1.000,1.000,1.000,1.000,1.000, &
    515        1.000,1.000,1.000,1.000,1.000,1.000, &
    516        1.000,1.000,1.000,1.000,1.000,1.000, &
    517        1.000,1.000,1.000,1.000,1.000,1.000, &
    518        1.000,1.000,1.000,1.000,1.000,1.000, &
    519        1.000,1.000,1.000,1.000,1.000,1.000, &
    520                                 ! seasalt coarse (computed below for 550nm)
    521        1.000,1.000,1.000,1.000,1.000,1.000, &
    522        1.000,1.000,1.000,1.000,1.000,1.000, &
    523        1.000,1.000,1.000,1.000,1.000,1.000, &
    524        1.000,1.000,1.000,1.000,1.000,1.000, &
    525        1.000,1.000,1.000,1.000,1.000,1.000, &
    526        1.000,1.000,1.000,1.000,1.000,1.000, &
    527        1.000,1.000,1.000,1.000,1.000,1.000, &
    528        1.000,1.000,1.000,1.000,1.000,1.000, &
    529        1.000,1.000,1.000,1.000,1.000,1.000, &
    530        1.000,1.000,1.000,1.000,1.000,1.000, &
    531                                 ! seasalt soluble accumulation (computed below for 550nm)
    532        1.000,1.000,1.000,1.000,1.000,1.000, &
    533        1.000,1.000,1.000,1.000,1.000,1.000, &
    534        1.000,1.000,1.000,1.000,1.000,1.000, &
    535        1.000,1.000,1.000,1.000,1.000,1.000, &
    536        1.000,1.000,1.000,1.000,1.000,1.000, &
    537        1.000,1.000,1.000,1.000,1.000,1.000, &
    538        1.000,1.000,1.000,1.000,1.000,1.000, &
    539        1.000,1.000,1.000,1.000,1.000,1.000, &
    540        1.000,1.000,1.000,1.000,1.000,1.000, &
    541        1.000,1.000,1.000,1.000,1.000,1.000/
     378     ! bc soluble
     379     .445, .445, .445, .445, .445, .445, &
     380     .445, .445, .470, .487, .508, .531, &
     381     .442, .442, .442, .442, .442, .442, &
     382     .442, .442, .462, .481, .506, .533, &
     383     .427, .427, .427, .427, .427, .427, &
     384     .427, .427, .449, .470, .497, .526, &
     385     .413, .413, .413, .413, .413, .413, &
     386     .413, .413, .437, .458, .486, .516, &
     387     .399, .399, .399, .399, .399, .399, &
     388     .399, .399, .423, .445, .473, .506, &
     389     ! pom soluble
     390     .975, .975, .975, .975, .975, .977, &
     391     .979, .982, .984, .987, .990, .994, &
     392     .972, .972, .972, .972, .973, .974, &
     393     .977, .980, .983, .986, .989, .993, &
     394     .963, .963, .963, .963, .964, .966, &
     395     .969, .974, .977, .982, .986, .991, &
     396     .955, .955, .955, .955, .955, .958, &
     397     .962, .967, .972, .977, .983, .989, &
     398     .944, .944, .944, .944, .944, .948, &
     399     .952, .959, .962, .972, .979, .987, &
     400     ! sulfate
     401     1.000,1.000,1.000,1.000,1.000,1.000, &
     402     1.000,1.000,1.000,1.000,1.000,1.000, &
     403     1.000,1.000,1.000,1.000,1.000,1.000, &
     404     1.000,1.000,1.000,1.000,1.000,1.000, &
     405     1.000,1.000,1.000,1.000,1.000,1.000, &
     406     1.000,1.000,1.000,1.000,1.000,1.000, &
     407     1.000,1.000,1.000,1.000,1.000,1.000, &
     408     1.000,1.000,1.000,1.000,1.000,1.000, &
     409     1.000,1.000,1.000,1.000,1.000,1.000, &
     410     1.000,1.000,1.000,1.000,1.000,1.000/
    542411  !
    543412  DATA piz_aeri_5wv/&
    … …  
    611480
    612481  IF (flag_aerosol .EQ. 1) THEN
    613      nb_aer = 1
     482     nb_aer = 2
    614483     ALLOCATE (aerosol_name(nb_aer))
    615484     aerosol_name(1) = id_ASSO4M
     485     aerosol_name(2) = id_CSSO4M
    616486  ELSEIF (flag_aerosol .EQ. 2) THEN
    617487     nb_aer = 2
    … …  
    767637                 mass_temp(i,k,spsol)*1000.*zdp1(i,k)*tau_ae5wv_int(i,k,la)*delt*fac
    768638
    769                tausum(i,la,spsol)=tausum(i,la,spsol)+tau3d(i,k)
    770            tau(i,k,la,spsol)=tau3d(i,k)
    771 
    772           ELSE                                           ! Case insoluble aerosol
     639          ELSE                                                  ! For insoluble aerosol
    773640              tau_ae5wv_int(i,k,la) = alpha_aeri_5wv(la,spinsol)
    774641              piz_ae5wv_int(i,k,la) = piz_aeri_5wv(la,spinsol)
    … …  
    778645                 mass_temp(i,k,naero_soluble+spinsol)*1000.*zdp1(i,k)* &
    779646                      tau_ae5wv_int(i,k,la)*delt*fac
    780 
    781                tausum(i,la,naero_soluble+spinsol)=tausum(i,la,spsol)+tau3d(i,k)
    782            tau(i,k,la,naero_soluble+spinsol)=tau3d(i,k)
    783 
    784647          ENDIF
    785 
     648         
    786649        ENDDO     ! Boucle sur les points géographiques (grille horizontale)
    787650      ENDDO     ! Boucle sur les niveaux verticaux
     651
     652      IF (soluble) THEN
     653
     654          tau(:,:,la,spsol)=tau3d(:,:)
     655     
     656          DO k=1, KLEV
     657            DO i=1,KLON
     658              tausum(i,la,spsol)=tausum(i,la,spsol)+tau3d(i,k)
     659            ENDDO
     660          ENDDO
     661      ELSE                                            ! For insoluble aerosol
     662          tau(:,:,la,naero_soluble+spinsol)=tau3d(:,:)
     663     
     664          DO k=1, KLEV
     665            DO i=1,KLON
     666              tausum(i,la,naero_soluble+spinsol)= &
     667                    tausum(i,la,naero_soluble+spinsol)+tau3d(i,k)
     668            ENDDO     ! Boucle sur les points géographiques (grille horizontale)
     669          ENDDO     ! Boucle sur les niveaux verticaux
     670      ENDIF
     671
    788672    ENDDO   ! boucle sur les longueurs d'onde
    789673  ENDDO     ! Boucle  sur les masses de traceurs
Note: See TracChangeset for help on using the changeset viewer.