Browse Source

Merge branch 'release/1.1.2'

main 1.1.2
Bill Ladwig 7 years ago
parent
commit
da2c458127
  1. 7
      doc/source/new.rst
  2. 5
      fortran/wrf_fctt.f90
  3. 2
      src/wrf/version.py

7
doc/source/new.rst

@ -4,6 +4,13 @@ What's New @@ -4,6 +4,13 @@ What's New
Releases
-------------
v1.1.2
^^^^^^^^^^^^^^
- Release 1.1.2
- Fix OpenMP directive issue with cloud top temperature.
v1.1.1
^^^^^^^^^^^^^^

5
fortran/wrf_fctt.f90

@ -26,7 +26,8 @@ SUBROUTINE wrfcttcalc(prs, tk, qci, qcw, qvp, ght, ter, ctt, haveqci, nz, ns, ew @@ -26,7 +26,8 @@ SUBROUTINE wrfcttcalc(prs, tk, qci, qcw, qvp, ght, ter, ctt, haveqci, nz, ns, ew
!$OMP PARALLEL
! Calculate the surface pressure
!$OMP DO COLLAPSE(2) SCHEDULE(runtime)
!$OMP DO COLLAPSE(2) PRIVATE(i, j, ratmix, arg1, arg2, vt, agl_hgt) &
!$OMP SCHEDULE(runtime)
DO j=1,ns
DO i=1,ew
ratmix = .001D0*qvp(i,j,1)
@ -40,7 +41,7 @@ SUBROUTINE wrfcttcalc(prs, tk, qci, qcw, qvp, ght, ter, ctt, haveqci, nz, ns, ew @@ -40,7 +41,7 @@ SUBROUTINE wrfcttcalc(prs, tk, qci, qcw, qvp, ght, ter, ctt, haveqci, nz, ns, ew
END DO
!$OMP END DO
!$OMP DO COLLAPSE(3) SCHEDULE(runtime)
!$OMP DO COLLAPSE(3) PRIVATE(i, j, k, ripk) SCHEDULE(runtime)
DO k=1,nz-1
DO j=1,ns
DO i=1,ew

2
src/wrf/version.py

@ -1,2 +1,2 @@ @@ -1,2 +1,2 @@
__version__ = "1.1.1"
__version__ = "1.1.2"

Loading…
Cancel
Save