Changeset 2725 for LMDZ5


Ignore:
Timestamp:
Dec 5, 2016, 4:52:37 PM (8 years ago)
Author:
oboucher
Message:

Indenting lines in IF ENDIF tests
Declaring dummy _glo fields for proc other than MPI and OMP root as
this is needed in debug mode at least on some machines

File:
1 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/phylmd/rrtm/readaerosolstrato2_rrtm.F90

    r2694 r2725  
    8181
    8282!--only root reads the data
    83     IF (is_mpi_root.AND.is_omp_root) THEN
     83      IF (is_mpi_root.AND.is_omp_root) THEN
    8484
    8585!--check mth_cur
    86     IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
    87       print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
    88     ENDIF
     86        IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
     87          print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
     88        ENDIF
    8989
    9090!--initialize n_lon as input data is 2D (lat-alt) only
    91     n_lon = nbp_lon
     91        n_lon = nbp_lon
    9292
    9393!--Starts with SW optical properties
    9494
    95     CALL nf95_open("tauswstrat.2D.nc", nf90_nowrite, ncid_in)
    96 
    97     CALL nf95_inq_varid(ncid_in, "LEV", varid)
    98     CALL nf95_gw_var(ncid_in, varid, lev)
    99     n_lev = size(lev)
    100     IF (n_lev.NE.klev) THEN
    101        abort_message='Le nombre de niveaux n est pas egal a klev'
    102        CALL abort_physic(modname,abort_message,1)
    103     ENDIF
    104 
    105     CALL nf95_inq_varid(ncid_in, "LAT", varid)
    106     CALL nf95_gw_var(ncid_in, varid, latitude)
    107     n_lat = size(latitude)
    108     IF (n_lat.NE.nbp_lat) THEN
    109        print *, 'latitude=', n_lat, nbp_lat
    110        abort_message='Le nombre de lat n est pas egal a nbp_lat'
    111        CALL abort_physic(modname,abort_message,1)
    112     ENDIF
    113 
    114     CALL nf95_inq_varid(ncid_in, "TIME", varid)
    115     CALL nf95_gw_var(ncid_in, varid, time)
    116     n_month = size(time)
    117     IF (n_month.NE.12) THEN
    118        abort_message='Le nombre de month n est pas egal a 12'
    119        CALL abort_physic(modname,abort_message,1)
    120     ENDIF
    121 
    122     CALL nf95_inq_varid(ncid_in, "WAV", varid)
    123     CALL nf95_gw_var(ncid_in, varid, wav)
    124     n_wav = size(wav)
    125     print *, 'WAV aerosol strato=', n_wav, wav
    126     IF (n_wav.NE.NSW) THEN
    127        abort_message='Le nombre de wav n est pas egal a NSW'
    128        CALL abort_physic(modname,abort_message,1)
    129     ENDIF
    130 
    131     ALLOCATE(tauaerstrat(n_lat, n_lev, n_wav, n_month))
    132     ALLOCATE(pizaerstrat(n_lat, n_lev, n_wav, n_month))
    133     ALLOCATE(cgaerstrat(n_lat, n_lev, n_wav, n_month))
    134 
    135     ALLOCATE(tauaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
    136     ALLOCATE(pizaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
    137     ALLOCATE(cgaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
    138 
    139     ALLOCATE(tauaerstrat_mois_glo(klon_glo, n_lev, n_wav))
    140     ALLOCATE(pizaerstrat_mois_glo(klon_glo, n_lev, n_wav))
    141     ALLOCATE(cgaerstrat_mois_glo(klon_glo, n_lev, n_wav))
     95        CALL nf95_open("tauswstrat.2D.nc", nf90_nowrite, ncid_in)
     96
     97        CALL nf95_inq_varid(ncid_in, "LEV", varid)
     98        CALL nf95_gw_var(ncid_in, varid, lev)
     99        n_lev = size(lev)
     100        IF (n_lev.NE.klev) THEN
     101           abort_message='Le nombre de niveaux n est pas egal a klev'
     102           CALL abort_physic(modname,abort_message,1)
     103        ENDIF
     104
     105        CALL nf95_inq_varid(ncid_in, "LAT", varid)
     106        CALL nf95_gw_var(ncid_in, varid, latitude)
     107        n_lat = size(latitude)
     108        IF (n_lat.NE.nbp_lat) THEN
     109           print *, 'latitude=', n_lat, nbp_lat
     110           abort_message='Le nombre de lat n est pas egal a nbp_lat'
     111           CALL abort_physic(modname,abort_message,1)
     112        ENDIF
     113
     114        CALL nf95_inq_varid(ncid_in, "TIME", varid)
     115        CALL nf95_gw_var(ncid_in, varid, time)
     116        n_month = size(time)
     117        IF (n_month.NE.12) THEN
     118           abort_message='Le nombre de month n est pas egal a 12'
     119           CALL abort_physic(modname,abort_message,1)
     120        ENDIF
     121
     122        CALL nf95_inq_varid(ncid_in, "WAV", varid)
     123        CALL nf95_gw_var(ncid_in, varid, wav)
     124        n_wav = size(wav)
     125        print *, 'WAV aerosol strato=', n_wav, wav
     126        IF (n_wav.NE.NSW) THEN
     127           abort_message='Le nombre de wav n est pas egal a NSW'
     128           CALL abort_physic(modname,abort_message,1)
     129        ENDIF
     130
     131        ALLOCATE(tauaerstrat(n_lat, n_lev, n_wav, n_month))
     132        ALLOCATE(pizaerstrat(n_lat, n_lev, n_wav, n_month))
     133        ALLOCATE(cgaerstrat(n_lat, n_lev, n_wav, n_month))
     134
     135        ALLOCATE(tauaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
     136        ALLOCATE(pizaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
     137        ALLOCATE(cgaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
     138
     139        ALLOCATE(tauaerstrat_mois_glo(klon_glo, n_lev, n_wav))
     140        ALLOCATE(pizaerstrat_mois_glo(klon_glo, n_lev, n_wav))
     141        ALLOCATE(cgaerstrat_mois_glo(klon_glo, n_lev, n_wav))
    142142
    143143!--reading stratospheric aerosol tau per layer
    144     CALL nf95_inq_varid(ncid_in, "TAU_SUN", varid)
    145     ncerr = nf90_get_var(ncid_in, varid, tauaerstrat)
    146     print *,'code erreur readaerosolstrato=', ncerr, varid
     144        CALL nf95_inq_varid(ncid_in, "TAU_SUN", varid)
     145        ncerr = nf90_get_var(ncid_in, varid, tauaerstrat)
     146        print *,'code erreur readaerosolstrato=', ncerr, varid
    147147
    148148!--reading stratospheric aerosol omega per layer
    149     CALL nf95_inq_varid(ncid_in, "OME_SUN", varid)
    150     ncerr = nf90_get_var(ncid_in, varid, pizaerstrat)
    151     print *,'code erreur readaerosolstrato=', ncerr, varid
     149        CALL nf95_inq_varid(ncid_in, "OME_SUN", varid)
     150        ncerr = nf90_get_var(ncid_in, varid, pizaerstrat)
     151        print *,'code erreur readaerosolstrato=', ncerr, varid
    152152
    153153!--reading stratospheric aerosol g per layer
    154     CALL nf95_inq_varid(ncid_in, "GGG_SUN", varid)
    155     ncerr = nf90_get_var(ncid_in, varid, cgaerstrat)
    156     print *,'code erreur readaerosolstrato sw=', ncerr, varid
    157 
    158     CALL nf95_close(ncid_in)
     154        CALL nf95_inq_varid(ncid_in, "GGG_SUN", varid)
     155        ncerr = nf90_get_var(ncid_in, varid, cgaerstrat)
     156        print *,'code erreur readaerosolstrato sw=', ncerr, varid
     157
     158        CALL nf95_close(ncid_in)
    159159
    160160!--select the correct month
    161161!--and copy into 1st longitude
    162     tauaerstrat_mois(1,:,:,:) = tauaerstrat(:,:,:,mth_cur)
    163     pizaerstrat_mois(1,:,:,:) = pizaerstrat(:,:,:,mth_cur)
    164     cgaerstrat_mois(1,:,:,:)  = cgaerstrat(:,:,:,mth_cur)
     162        tauaerstrat_mois(1,:,:,:) = tauaerstrat(:,:,:,mth_cur)
     163        pizaerstrat_mois(1,:,:,:) = pizaerstrat(:,:,:,mth_cur)
     164        cgaerstrat_mois(1,:,:,:)  = cgaerstrat(:,:,:,mth_cur)
    165165
    166166!--copy longitudes
    167     DO i=2, n_lon
    168      tauaerstrat_mois(i,:,:,:) = tauaerstrat_mois(1,:,:,:)
    169      pizaerstrat_mois(i,:,:,:) = pizaerstrat_mois(1,:,:,:)
    170       cgaerstrat_mois(i,:,:,:)  = cgaerstrat_mois(1,:,:,:)
    171     ENDDO
     167        DO i=2, n_lon
     168         tauaerstrat_mois(i,:,:,:) = tauaerstrat_mois(1,:,:,:)
     169         pizaerstrat_mois(i,:,:,:) = pizaerstrat_mois(1,:,:,:)
     170         cgaerstrat_mois(i,:,:,:)  = cgaerstrat_mois(1,:,:,:)
     171        ENDDO
    172172
    173173!---reduce to a klon_glo grid
    174     DO band=1, NSW
    175       CALL grid2dTo1d_glo(tauaerstrat_mois(:,:,:,band),tauaerstrat_mois_glo(:,:,band))
    176       CALL grid2dTo1d_glo(pizaerstrat_mois(:,:,:,band),pizaerstrat_mois_glo(:,:,band))
    177       CALL grid2dTo1d_glo(cgaerstrat_mois(:,:,:,band),cgaerstrat_mois_glo(:,:,band))
    178     ENDDO
     174        DO band=1, NSW
     175          CALL grid2dTo1d_glo(tauaerstrat_mois(:,:,:,band),tauaerstrat_mois_glo(:,:,band))
     176          CALL grid2dTo1d_glo(pizaerstrat_mois(:,:,:,band),pizaerstrat_mois_glo(:,:,band))
     177          CALL grid2dTo1d_glo(cgaerstrat_mois(:,:,:,band),cgaerstrat_mois_glo(:,:,band))
     178        ENDDO
    179179
    180180!--Now LW optical properties
    181181!
    182     CALL nf95_open("taulwstrat.2D.nc", nf90_nowrite, ncid_in)
    183 
    184     CALL nf95_inq_varid(ncid_in, "LEV", varid)
    185     CALL nf95_gw_var(ncid_in, varid, lev)
    186     n_lev = size(lev)
    187     IF (n_lev.NE.klev) THEN
    188        abort_message='Le nombre de niveaux n est pas egal a klev'
    189        CALL abort_physic(modname,abort_message,1)
    190     ENDIF
    191 
    192     CALL nf95_inq_varid(ncid_in, "LAT", varid)
    193     CALL nf95_gw_var(ncid_in, varid, latitude)
    194     n_lat = size(latitude)
    195     IF (n_lat.NE.nbp_lat) THEN
    196        abort_message='Le nombre de lat n est pas egal a nbp_lat'
    197        CALL abort_physic(modname,abort_message,1)
    198     ENDIF
    199 
    200     CALL nf95_inq_varid(ncid_in, "TIME", varid)
    201     CALL nf95_gw_var(ncid_in, varid, time)
    202     n_month = size(time)
    203     IF (n_month.NE.12) THEN
    204        abort_message='Le nombre de month n est pas egal a 12'
    205        CALL abort_physic(modname,abort_message,1)
    206     ENDIF
    207 
    208     CALL nf95_inq_varid(ncid_in, "WAV", varid)
    209     CALL nf95_gw_var(ncid_in, varid, wav)
    210     n_wav = size(wav)
    211     print *, 'WAV aerosol strato=', n_wav, wav
    212     IF (n_wav.NE.NLW) THEN
    213        abort_message='Le nombre de wav n est pas egal a NLW'
    214        CALL abort_physic(modname,abort_message,1)
    215     ENDIF
    216 
    217     ALLOCATE(taulwaerstrat(n_lat, n_lev, n_wav, n_month))
    218     ALLOCATE(taulwaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
    219     ALLOCATE(taulwaerstrat_mois_glo(klon_glo, n_lev, n_wav))
     182        CALL nf95_open("taulwstrat.2D.nc", nf90_nowrite, ncid_in)
     183
     184        CALL nf95_inq_varid(ncid_in, "LEV", varid)
     185        CALL nf95_gw_var(ncid_in, varid, lev)
     186        n_lev = size(lev)
     187        IF (n_lev.NE.klev) THEN
     188           abort_message='Le nombre de niveaux n est pas egal a klev'
     189           CALL abort_physic(modname,abort_message,1)
     190        ENDIF
     191
     192        CALL nf95_inq_varid(ncid_in, "LAT", varid)
     193        CALL nf95_gw_var(ncid_in, varid, latitude)
     194        n_lat = size(latitude)
     195        IF (n_lat.NE.nbp_lat) THEN
     196           abort_message='Le nombre de lat n est pas egal a nbp_lat'
     197           CALL abort_physic(modname,abort_message,1)
     198        ENDIF
     199
     200        CALL nf95_inq_varid(ncid_in, "TIME", varid)
     201        CALL nf95_gw_var(ncid_in, varid, time)
     202        n_month = size(time)
     203        IF (n_month.NE.12) THEN
     204           abort_message='Le nombre de month n est pas egal a 12'
     205           CALL abort_physic(modname,abort_message,1)
     206        ENDIF
     207
     208        CALL nf95_inq_varid(ncid_in, "WAV", varid)
     209        CALL nf95_gw_var(ncid_in, varid, wav)
     210        n_wav = size(wav)
     211        print *, 'WAV aerosol strato=', n_wav, wav
     212        IF (n_wav.NE.NLW) THEN
     213           abort_message='Le nombre de wav n est pas egal a NLW'
     214           CALL abort_physic(modname,abort_message,1)
     215        ENDIF
     216
     217        ALLOCATE(taulwaerstrat(n_lat, n_lev, n_wav, n_month))
     218        ALLOCATE(taulwaerstrat_mois(n_lon, n_lat, n_lev, n_wav))
     219        ALLOCATE(taulwaerstrat_mois_glo(klon_glo, n_lev, n_wav))
    220220
    221221!--reading stratospheric aerosol lw tau per layer
    222     CALL nf95_inq_varid(ncid_in, "TAU_EAR", varid)
    223     ncerr = nf90_get_var(ncid_in, varid, taulwaerstrat)
    224     print *,'code erreur readaerosolstrato lw=', ncerr, varid
    225 
    226     CALL nf95_close(ncid_in)
     222        CALL nf95_inq_varid(ncid_in, "TAU_EAR", varid)
     223        ncerr = nf90_get_var(ncid_in, varid, taulwaerstrat)
     224        print *,'code erreur readaerosolstrato lw=', ncerr, varid
     225
     226        CALL nf95_close(ncid_in)
    227227
    228228!--select the correct month
    229229!--and copy into 1st longitude
    230     taulwaerstrat_mois(1,:,:,:) = taulwaerstrat(:,:,:,mth_cur)
     230        taulwaerstrat_mois(1,:,:,:) = taulwaerstrat(:,:,:,mth_cur)
    231231!--copy longitudes
    232     DO i=2, n_lon
    233       taulwaerstrat_mois(i,:,:,:) = taulwaerstrat_mois(1,:,:,:)
    234     ENDDO
     232        DO i=2, n_lon
     233          taulwaerstrat_mois(i,:,:,:) = taulwaerstrat_mois(1,:,:,:)
     234        ENDDO
    235235
    236236!---reduce to a klon_glo grid
    237     DO band=1, NLW
    238       CALL grid2dTo1d_glo(taulwaerstrat_mois(:,:,:,band),taulwaerstrat_mois_glo(:,:,band))
    239     ENDDO
    240 
    241     ENDIF !--is_mpi_root and is_omp_root
     237        DO band=1, NLW
     238          CALL grid2dTo1d_glo(taulwaerstrat_mois(:,:,:,band),taulwaerstrat_mois_glo(:,:,band))
     239        ENDDO
     240
     241      ELSE !--proc other than mpi_root and omp_root
     242           !--dummy allocation needed for debug mode
     243
     244        ALLOCATE(tauaerstrat_mois_glo(1,1,1))
     245        ALLOCATE(pizaerstrat_mois_glo(1,1,1))
     246        ALLOCATE(cgaerstrat_mois_glo(1,1,1))
     247        ALLOCATE(taulwaerstrat_mois_glo(1,1,1))
     248
     249      ENDIF !--is_mpi_root and is_omp_root
    242250
    243251!$OMP BARRIER
    244252
    245253!--keep memory of previous month
    246     mth_pre=mth_cur
     254      mth_pre=mth_cur
    247255
    248256!--scatter on all proc
    249     CALL scatter(tauaerstrat_mois_glo,tau_aer_strat)
    250     CALL scatter(pizaerstrat_mois_glo,piz_aer_strat)
    251     CALL scatter(cgaerstrat_mois_glo,cg_aer_strat)
    252     CALL scatter(taulwaerstrat_mois_glo,taulw_aer_strat)
    253 
    254     IF (is_mpi_root.AND.is_omp_root) THEN
    255 !
    256     DEALLOCATE(tauaerstrat, pizaerstrat, cgaerstrat)
    257     DEALLOCATE(tauaerstrat_mois, pizaerstrat_mois, cgaerstrat_mois)
    258     DEALLOCATE(tauaerstrat_mois_glo,pizaerstrat_mois_glo,cgaerstrat_mois_glo)
    259 
    260     DEALLOCATE(taulwaerstrat,taulwaerstrat_mois,taulwaerstrat_mois_glo)
    261 !
    262     ENDIF !--is_mpi_root and is_omp_root
     257      CALL scatter(tauaerstrat_mois_glo,tau_aer_strat)
     258      CALL scatter(pizaerstrat_mois_glo,piz_aer_strat)
     259      CALL scatter(cgaerstrat_mois_glo,cg_aer_strat)
     260      CALL scatter(taulwaerstrat_mois_glo,taulw_aer_strat)
     261
     262      IF (is_mpi_root.AND.is_omp_root) THEN
     263!
     264        DEALLOCATE(tauaerstrat, pizaerstrat, cgaerstrat)
     265        DEALLOCATE(tauaerstrat_mois, pizaerstrat_mois, cgaerstrat_mois)
     266        DEALLOCATE(taulwaerstrat,taulwaerstrat_mois)
     267!
     268      ENDIF !--is_mpi_root and is_omp_root
     269
     270      DEALLOCATE(tauaerstrat_mois_glo,pizaerstrat_mois_glo,cgaerstrat_mois_glo)
     271      DEALLOCATE(taulwaerstrat_mois_glo)
    263272
    264273!$OMP BARRIER
     
    282291!--weighted average for cg, piz and tau, adding strat aerosols on top of tropospheric ones
    283292    DO band=1, NSW
    284     WHERE (stratomask.GT.0.999999)
     293      WHERE (stratomask.GT.0.999999)
    285294!--anthropogenic aerosols bands 1 to NSW
    286     cg_aero_sw_rrtm(:,:,2,band)  = ( cg_aero_sw_rrtm(:,:,2,band)*piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) + &
    287                                      cg_aer_strat(:,:,band)*piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /              &
    288                                 MAX( piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) +                             &
    289                                      piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band), 1.e-15 )
    290     piz_aero_sw_rrtm(:,:,2,band) = ( piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) +                             &
    291                                      piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /                                     &
    292                                 MAX( tau_aero_sw_rrtm(:,:,2,band) + tau_aer_strat(:,:,band), 1.e-15 )
    293     tau_aero_sw_rrtm(:,:,2,band)  = tau_aero_sw_rrtm(:,:,2,band) + tau_aer_strat(:,:,band)
     295        cg_aero_sw_rrtm(:,:,2,band)  = ( cg_aero_sw_rrtm(:,:,2,band)*piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) + &
     296                                         cg_aer_strat(:,:,band)*piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /              &
     297                                    MAX( piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) +                             &
     298                                         piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band), 1.e-15 )
     299        piz_aero_sw_rrtm(:,:,2,band) = ( piz_aero_sw_rrtm(:,:,2,band)*tau_aero_sw_rrtm(:,:,2,band) +                             &
     300                                         piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /                                     &
     301                                    MAX( tau_aero_sw_rrtm(:,:,2,band) + tau_aer_strat(:,:,band), 1.e-15 )
     302        tau_aero_sw_rrtm(:,:,2,band)  = tau_aero_sw_rrtm(:,:,2,band) + tau_aer_strat(:,:,band)
    294303!--natural aerosols bands 1 to NSW
    295     cg_aero_sw_rrtm(:,:,1,band)  = ( cg_aero_sw_rrtm(:,:,1,band)*piz_aero_sw_rrtm(:,:,1,band)*tau_aero_sw_rrtm(:,:,1,band) + &
    296                                      cg_aer_strat(:,:,band)*piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /              &
    297                                 MAX( piz_aero_sw_rrtm(:,:,1,band)*tau_aero_sw_rrtm(:,:,1,band) +                             &
    298                                      piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band), 1.e-15 )
    299     piz_aero_sw_rrtm(:,:,1,band) = ( piz_aero_sw_rrtm(:,:,1,band)*tau_aero_sw_rrtm(:,:,1,band) +                             &
    300                                      piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /                                     &
    301                                 MAX( tau_aero_sw_rrtm(:,:,1,band) + tau_aer_strat(:,:,band), 1.e-15 )
    302     tau_aero_sw_rrtm(:,:,1,band)  = tau_aero_sw_rrtm(:,:,1,band) + tau_aer_strat(:,:,band)
     304        cg_aero_sw_rrtm(:,:,1,band)  = ( cg_aero_sw_rrtm(:,:,1,band)*piz_aero_sw_rrtm(:,:,1,band)*tau_aero_sw_rrtm(:,:,1,band) + &
     305                                         cg_aer_strat(:,:,band)*piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /              &
     306                                    MAX( piz_aero_sw_rrtm(:,:,1,band)*tau_aero_sw_rrtm(:,:,1,band) +                             &
     307                                         piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band), 1.e-15 )
     308        piz_aero_sw_rrtm(:,:,1,band) = ( piz_aero_sw_rrtm(:,:,1,band)*tau_aero_sw_rrtm(:,:,1,band) +                             &
     309                                         piz_aer_strat(:,:,band)*tau_aer_strat(:,:,band) ) /                                     &
     310                                    MAX( tau_aero_sw_rrtm(:,:,1,band) + tau_aer_strat(:,:,band), 1.e-15 )
     311        tau_aero_sw_rrtm(:,:,1,band)  = tau_aero_sw_rrtm(:,:,1,band) + tau_aer_strat(:,:,band)
    303312!--no stratospheric aerosol in index 1 for these tests
    304 !    cg_aero_sw_rrtm(:,:,1,band)  =  cg_aero_sw_rrtm(:,:,1,band)
    305 !    piz_aero_sw_rrtm(:,:,1,band)  = piz_aero_sw_rrtm(:,:,1,band)
    306 !    tau_aero_sw_rrtm(:,:,1,band)  = tau_aero_sw_rrtm(:,:,1,band)
     313!        cg_aero_sw_rrtm(:,:,1,band)  =  cg_aero_sw_rrtm(:,:,1,band)
     314!        piz_aero_sw_rrtm(:,:,1,band)  = piz_aero_sw_rrtm(:,:,1,band)
     315!        tau_aero_sw_rrtm(:,:,1,band)  = tau_aero_sw_rrtm(:,:,1,band)
    307316    ENDWHERE
    308317    ENDDO
     
    322331
    323332    DO band=1, NLW
    324     WHERE (stratomask.GT.0.999999)
    325     tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + taulw_aer_strat(:,:,band)
    326     tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,1,band) + taulw_aer_strat(:,:,band)
     333      WHERE (stratomask.GT.0.999999)
     334        tau_aero_lw_rrtm(:,:,2,band)  = tau_aero_lw_rrtm(:,:,2,band) + taulw_aer_strat(:,:,band)
     335        tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,1,band) + taulw_aer_strat(:,:,band)
    327336!--no stratospheric aerosols in index 1 for these tests
    328337!    tau_aero_lw_rrtm(:,:,1,band)  = tau_aero_lw_rrtm(:,:,1,band)
    329     ENDWHERE
     338      ENDWHERE
    330339    ENDDO
    331340
Note: See TracChangeset for help on using the changeset viewer.