Skip to content

Commit 9e8b9ca

Browse files
committed
Updating moisture mode calculation stuff
1 parent 018b4a5 commit 9e8b9ca

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

src/extract.jl

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -365,12 +365,10 @@ function extractmoisturemode(
365365
t = collect(t[1:(end-1)] .+ t[2:end]) / 2
366366
t = t / tperday
367367

368-
mse = zeros(64,nt,nmember) * NaN
369368
pre = zeros(64,nt,nmember) * NaN
370369
tbs = zeros(64,nt,nmember) * NaN
371370
qbs = zeros(64,nt,nmember) * NaN
372371

373-
int_mse = zeros(nt,nmember) * NaN
374372
int_tbs = zeros(nt,nmember) * NaN
375373
int_qbs = zeros(nt,nmember) * NaN
376374

@@ -385,8 +383,7 @@ function extractmoisturemode(
385383
ods = NCDataset(fnc)
386384
try
387385
z[:,ids] .= ods["z"][:]
388-
pre[:,:,ids] .= ods["PRES"][:,:]
389-
mse[:,:,ids] .= ods["MSE"][:,:]
386+
pre[:,:,ids] .= ods["PRES"][:,:] * 100
390387
tbs[:,:,ids] .= ods["TBIAS"][:,:]
391388
qbs[:,:,ids] .= ods["QBIAS"][:,:]
392389
catch
@@ -399,15 +396,14 @@ function extractmoisturemode(
399396

400397
end
401398

402-
ipp = zeros(66); ipp[1] = 1009.23; iipp = @view ipp[2:(end-1)]
399+
ipp = zeros(66); ipp[1] = 100923; iipp = @view ipp[2:(end-1)]
403400
itmp = zeros(66); iitmp = @view itmp[2:(end-1)]
404401

405402
for ids = 1 : nmember, it = 1 : nt
406403

407404
iipp .= pre[:,it,ids]
408-
iitmp .= mse[:,it,ids]; int_mse[it,ids] = -trapz(ipp,itmp)
409-
iitmp .= tbs[:,it,ids]; int_tbs[it,ids] = -trapz(ipp,itmp)
410-
iitmp .= qbs[:,it,ids]; int_qbs[it,ids] = -trapz(ipp,itmp)
405+
iitmp .= tbs[:,it,ids]; int_tbs[it,ids] = -trapz(ipp,itmp) * 1.0035
406+
iitmp .= qbs[:,it,ids]; int_qbs[it,ids] = -trapz(ipp,itmp) * 2.5009
411407

412408
end
413409

@@ -455,9 +451,9 @@ function extractmoisturemode(
455451

456452
nctime[:] = t
457453
ncz[:] = dropdims(mean(z,dims=2),dims=2)
458-
ncmse[:,:] = int_mse
459454
nctbs[:,:] = int_tbs
460455
ncqbs[:,:] = int_qbs
456+
ncmse[:,:] = int_tbs .+ int_qbs
461457

462458
close(nds)
463459

0 commit comments

Comments
 (0)