Skip to content

Commit 389c3f8

Browse files
author
Steve Goldhaber
committed
Ready to test CO2 changes
1 parent 683859b commit 389c3f8

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

src/physics/cam/ghg_data.F90

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ subroutine trcmix(name, lchnk, ncol, clat, pmid, q)
136136
real(r8) dlat ! latitude in degrees
137137
real(r8) ptrop ! pressure level of tropopause
138138
real(r8) pratio ! pressure divided by ptrop
139-
real(r8) trop_mmr ! tropospheric mass mixing ratio
139+
real(r8) trop_mmr(pcols) ! tropospheric mass mixing ratio
140140
real(r8) scale ! pressure scale height
141141
!-----------------------------------------------------------------------
142142

@@ -150,12 +150,12 @@ subroutine trcmix(name, lchnk, ncol, clat, pmid, q)
150150

151151
else if (name == 'CO2') then
152152

153-
q = chem_surfvals_co2_rad(lchnk, ncol)
153+
q = chem_surfvals_co2_rad()
154154

155155
else if (name == 'CH4') then
156156

157157
! set tropospheric mass mixing ratios
158-
trop_mmr = rmwch4 * chem_surfvals_get('CH4VMR', lchnk, ncol)
158+
trop_mmr(:ncol) = rmwch4 * chem_surfvals_get('CH4VMR', lchnk, ncol)
159159

160160
do k = 1,pver
161161
do i = 1,ncol
@@ -172,18 +172,18 @@ subroutine trcmix(name, lchnk, ncol, clat, pmid, q)
172172

173173
! determine output mass mixing ratios
174174
if (pmid(i,k) >= ptrop) then
175-
q(i,k) = trop_mmr
175+
q(i,k) = trop_mmr(i)
176176
else
177177
pratio = pmid(i,k)/ptrop
178-
q(i,k) = trop_mmr * (pratio)**scale
178+
q(i,k) = trop_mmr(i) * (pratio)**scale
179179
end if
180180
end do
181181
end do
182182

183183
else if (name == 'N2O') then
184184

185185
! set tropospheric mass mixing ratios
186-
trop_mmr = rmwn2o * chem_surfvals_get('N2OVMR', lchnk, ncol)
186+
trop_mmr(:ncol) = rmwn2o * chem_surfvals_get('N2OVMR', lchnk, ncol)
187187

188188
do k = 1,pver
189189
do i = 1,ncol
@@ -200,18 +200,18 @@ subroutine trcmix(name, lchnk, ncol, clat, pmid, q)
200200

201201
! determine output mass mixing ratios
202202
if (pmid(i,k) >= ptrop) then
203-
q(i,k) = trop_mmr
203+
q(i,k) = trop_mmr(i)
204204
else
205205
pratio = pmid(i,k)/ptrop
206-
q(i,k) = trop_mmr * (pratio)**scale
206+
q(i,k) = trop_mmr(i) * (pratio)**scale
207207
end if
208208
end do
209209
end do
210210

211211
else if (name == 'CFC11') then
212212

213213
! set tropospheric mass mixing ratios
214-
trop_mmr = rmwf11 * chem_surfvals_get('F11VMR', lchnk, ncol)
214+
trop_mmr(:ncol) = rmwf11 * chem_surfvals_get('F11VMR', lchnk, ncol)
215215

216216
do k = 1,pver
217217
do i = 1,ncol
@@ -228,18 +228,18 @@ subroutine trcmix(name, lchnk, ncol, clat, pmid, q)
228228

229229
! determine output mass mixing ratios
230230
if (pmid(i,k) >= ptrop) then
231-
q(i,k) = trop_mmr
231+
q(i,k) = trop_mmr(i)
232232
else
233233
pratio = pmid(i,k)/ptrop
234-
q(i,k) = trop_mmr * (pratio)**scale
234+
q(i,k) = trop_mmr(i) * (pratio)**scale
235235
end if
236236
end do
237237
end do
238238

239239
else if (name == 'CFC12') then
240240

241241
! set tropospheric mass mixing ratios
242-
trop_mmr = rmwf12 * chem_surfvals_get('F12VMR', lchnk, ncol)
242+
trop_mmr(:ncol) = rmwf12 * chem_surfvals_get('F12VMR', lchnk, ncol)
243243

244244
do k = 1,pver
245245
do i = 1,ncol
@@ -256,10 +256,10 @@ subroutine trcmix(name, lchnk, ncol, clat, pmid, q)
256256

257257
! determine output mass mixing ratios
258258
if (pmid(i,k) >= ptrop) then
259-
q(i,k) = trop_mmr
259+
q(i,k) = trop_mmr(i)
260260
else
261261
pratio = pmid(i,k)/ptrop
262-
q(i,k) = trop_mmr * (pratio)**scale
262+
q(i,k) = trop_mmr(i) * (pratio)**scale
263263
end if
264264
end do
265265
end do

0 commit comments

Comments
 (0)