From 8c66408920f89211383ed583f00b7f7570f0dfda Mon Sep 17 00:00:00 2001 From: Bill Ladwig Date: Wed, 18 Oct 2017 16:27:53 -0600 Subject: [PATCH] Fix computational problem with new fortran DCAPECALC2D routine --- fortran/rip_cape.f90 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fortran/rip_cape.f90 b/fortran/rip_cape.f90 index 84fdb30..51c3916 100644 --- a/fortran/rip_cape.f90 +++ b/fortran/rip_cape.f90 @@ -683,7 +683,7 @@ SUBROUTINE DCAPECALC2D(prs,tmk,qvp,ght,ter,sfp,cape,cin,& ! kg/kg (should range from 0.000 to 0.025) ! -!$OMP PARALLEL DO +!$OMP PARALLEL DO COLLAPSE(3) DO j = 1,mjy DO i = 1,mix DO k = 1,mkzh @@ -731,7 +731,8 @@ SUBROUTINE DCAPECALC2D(prs,tmk,qvp,ght,ter,sfp,cape,cin,& DO k = 1, mkzh IF (ght_new(k,i,j)-ter(i,j) .LT. 3000.d0) THEN tlcl = TLCLC1 / (LOG(tmk_new(k,i,j)**TLCLC2/& - (MAX(qvp_new(k,i,j), 1.d-15)*prs_new(k,i,j)/(EPS+MAX(qvp_new(k,i,j), 1.d-15))))-TLCLC3)+TLCLC4 + (MAX(qvp_new(k,i,j), 1.d-15)*prs_new(k,i,j)/(EPS+MAX(qvp_new(k,i,j), 1.d-15))))-TLCLC3)+& + TLCLC4 eth_temp(k) = tmk_new(k,i,j) * (1000.d0/prs_new(k,i,j))**& (GAMMA*(1.d0 + GAMMAMD*(MAX(qvp_new(k,i,j), 1.d-15))))*& EXP((THTECON1/tlcl - THTECON2)*(MAX(qvp_new(k,i,j), 1.d-15))*&