Changeset 6150


Ignore:
Timestamp:
05/26/22 20:21:20 (2 years ago)
Author:
oboucher
Message:

Correct some errors in the writing of ss_w and ss_g

Location:
TOOLS/CMIP6_FORCING/AER_OPTICS
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TOOLS/CMIP6_FORCING/AER_OPTICS/mie_6bands_bc_v4.f

    r3385 r6150  
    145145c 
    146146       OPEN (unit=14, file='SEXT_bc_soluble_6bands.txt') 
    147        OPEN (unit=15, file='G_bc_soluble_6bands.txt') 
    148        OPEN (unit=16, file='SSA_bc_soluble_6bands.txt') 
     147       OPEN (unit=15, file='SSA_bc_soluble_6bands.txt') 
     148       OPEN (unit=16, file='G_bc_soluble_6bands.txt') 
    149149c 
    150150       OPEN (unit=24, file='SEXT_bc_insoluble_6bands.txt') 
    151        OPEN (unit=25, file='G_bc_insoluble_6bands.txt') 
    152        OPEN (unit=26, file='SSA_bc_insoluble_6bands.txt') 
     151       OPEN (unit=25, file='SSA_bc_insoluble_6bands.txt') 
     152       OPEN (unit=26, file='G_bc_insoluble_6bands.txt') 
    153153c 
    154154       OPEN (unit=34, file='SEXT_bc_soluble_5wave.txt') 
    … …  
    409409        WRITE(15,*) '  ! '//chmode(mode) 
    410410        DO k=1, NbandSW 
    411           WRITE(15,951) (ss_g(k,IRH),IRH=1,rh_int) 
     411          WRITE(15,951) (ss_w(k,IRH),IRH=1,rh_int) 
    412412        ENDDO 
    413413        WRITE(16,*) '  ! '//chmode(mode) 
    414414        DO k=1, NbandSW 
    415           WRITE(16,951) (ss_w(k,IRH),IRH=1,rh_int) 
     415          WRITE(16,951) (ss_g(k,IRH),IRH=1,rh_int) 
    416416        ENDDO 
    417417c 

  • TOOLS/CMIP6_FORCING/AER_OPTICS/mie_6bands_nitrate_v4.f

    r3385 r6150  
    145145c 
    146146       OPEN (unit=14, file='SEXT_nitrate_soluble_6bands.txt') 
    147        OPEN (unit=15, file='G_nitrate_soluble_6bands.txt') 
    148        OPEN (unit=16, file='SSA_nitrate_soluble_6bands.txt') 
     147       OPEN (unit=15, file='SSA_nitrate_soluble_6bands.txt') 
     148       OPEN (unit=16, file='G_nitrate_soluble_6bands.txt') 
    149149c 
    150150       OPEN (unit=34, file='SEXT_nitrate_soluble_5wave.txt') 
    … …  
    154154c 
    155155       OPEN (unit=24, file='SEXT_nitrate_insoluble_6bands.txt') 
    156        OPEN (unit=25, file='G_nitrate_insoluble_6bands.txt') 
    157        OPEN (unit=26, file='SSA_nitrate_insoluble_6bands.txt') 
     156       OPEN (unit=25, file='SSA_nitrate_insoluble_6bands.txt') 
     157       OPEN (unit=26, file='G_nitrate_insoluble_6bands.txt') 
    158158c 
    159159c--initializing wavelengths 
    … …  
    410410        WRITE(15,*) '  ! '//chmode(mode) 
    411411        DO k=1, NbandSW 
    412           WRITE(15,951) (ss_g(k,IRH),IRH=1,rh_int) 
     412          WRITE(15,951) (ss_w(k,IRH),IRH=1,rh_int) 
    413413        ENDDO 
    414414        WRITE(16,*) '  ! '//chmode(mode) 
    415415        DO k=1, NbandSW 
    416           WRITE(16,951) (ss_w(k,IRH),IRH=1,rh_int) 
     416          WRITE(16,951) (ss_g(k,IRH),IRH=1,rh_int) 
    417417        ENDDO 
    418418c 
    … …  
    434434        WRITE(24,953) (ss_a(k,1),k=1,NbandSW) 
    435435        WRITE(25,*) '  ! Nitrate insoluble' 
    436         WRITE(25,953) (ss_g(k,1),k=1,NbandSW) 
     436        WRITE(25,953) (ss_w(k,1),k=1,NbandSW) 
    437437        WRITE(26,*) '  ! Nitrate insoluble' 
    438         WRITE(26,953) (ss_w(k,1),k=1,NbandSW) 
     438        WRITE(26,953) (ss_g(k,1),k=1,NbandSW) 
    439439c 
    440440        WRITE(35,*) '  ! extinction Nitrate insoluble' 

  • TOOLS/CMIP6_FORCING/AER_OPTICS/mie_6bands_pom_v4.f

    r3385 r6150  
    143143c 
    144144       OPEN (unit=14, file='SEXT_pom_soluble_6bands.txt') 
    145        OPEN (unit=15, file='G_pom_soluble_6bands.txt') 
    146        OPEN (unit=16, file='SSA_pom_soluble_6bands.txt') 
     145       OPEN (unit=15, file='SSA_pom_soluble_6bands.txt') 
     146       OPEN (unit=16, file='G_pom_soluble_6bands.txt') 
    147147c 
    148148       OPEN (unit=24, file='SEXT_pom_insoluble_6bands.txt') 
    149        OPEN (unit=25, file='G_pom_insoluble_6bands.txt') 
    150        OPEN (unit=26, file='SSA_pom_insoluble_6bands.txt') 
     149       OPEN (unit=25, file='SSA_pom_insoluble_6bands.txt') 
     150       OPEN (unit=26, file='G_pom_insoluble_6bands.txt') 
    151151c 
    152152       OPEN (unit=34, file='SEXT_pom_soluble_5wave.txt') 
    … …  
    407407        WRITE(15,*) '  ! '//chmode(mode) 
    408408        DO k=1, NbandSW 
    409         WRITE(15,951) (ss_g(k,IRH),IRH=1,rh_int) 
     409        WRITE(15,951) (ss_w(k,IRH),IRH=1,rh_int) 
    410410        ENDDO 
    411411        WRITE(16,*) '  ! '//chmode(mode) 
    412412        DO k=1, NbandSW 
    413         WRITE(16,951) (ss_w(k,IRH),IRH=1,rh_int) 
     413        WRITE(16,951) (ss_g(k,IRH),IRH=1,rh_int) 
    414414        ENDDO 
    415415c 

  • TOOLS/CMIP6_FORCING/AER_OPTICS/mie_6bands_seasalt_v4.f

    r3385 r6150  
    149149c 
    150150       OPEN (unit=14, file='SEXT_seasalt_6bands.txt') 
    151        OPEN (unit=15, file='G_seasalt_6bands.txt') 
    152        OPEN (unit=16, file='SSA_seasalt_6bands.txt') 
     151       OPEN (unit=15, file='SSA_seasalt_6bands.txt') 
     152       OPEN (unit=16, file='G_seasalt_6bands.txt') 
    153153       OPEN (unit=24, file='SEXT_seasalt_5wave.txt') 
    154154       OPEN (unit=25, file='SABS_seasalt_5wave.txt') 
    … …  
    408408        WRITE(15,*) '  ! '//chmode(mode) 
    409409        DO k=1, NbandSW 
    410         WRITE(15,951) (ss_g(k,IRH),IRH=1,rh_int) 
     410        WRITE(15,951) (ss_w(k,IRH),IRH=1,rh_int) 
    411411        ENDDO 
    412412        WRITE(16,*) '  ! '//chmode(mode) 
    413413        DO k=1, NbandSW 
    414         WRITE(16,951) (ss_w(k,IRH),IRH=1,rh_int) 
     414        WRITE(16,951) (ss_g(k,IRH),IRH=1,rh_int) 
    415415        ENDDO 
    416416c 

  • TOOLS/CMIP6_FORCING/AER_OPTICS/mie_6bands_sulfate.f

    r3385 r6150  
    150150c 
    151151        OPEN (unit=14, file='SEXT_sulfate_6bands.txt') 
    152         OPEN (unit=15, file='G_sulfate_6bands.txt') 
    153         OPEN (unit=16, file='SSA_sulfate_6bands.txt') 
     152        OPEN (unit=15, file='SSA_sulfate_6bands.txt') 
     153        OPEN (unit=16, file='G_sulfate_6bands.txt') 
    154154        OPEN (unit=17, file='QEXT_sulfate_6bands.txt') 
    155155 
    … …  
    518518        WRITE(15,*) ' ! '//chmode(mode) 
    519519        DO k=1, NbandSW 
    520         WRITE(15,951) (ss_g(k,irh),irh=1,Nrh) 
     520        WRITE(15,951) (ss_w(k,irh),irh=1,Nrh) 
    521521        ENDDO 
    522522        WRITE(16,*) ' ! '//chmode(mode) 
    523523        DO k=1, NbandSW 
    524         WRITE(16,951) (ss_w(k,irh),irh=1,Nrh) 
     524        WRITE(16,951) (ss_g(k,irh),irh=1,Nrh) 
    525525        ENDDO 
    526526        DO k=1, NbandSW 
Note: See TracChangeset for help on using the changeset viewer.