Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SHOC-MF updates #902

Merged
merged 11 commits into from
Feb 21, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -1723,12 +1723,12 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
call MAPL_FieldBundleAdd (BUNDLE, FIELD, RC=STATUS )
VERIFY_(STATUS)

call ESMF_StateGet (GEX(TURBL), 'QT3' , FIELD, RC=STATUS )
VERIFY_(STATUS)
call ESMF_AttributeSet(FIELD, NAME="DiffuseLike" ,VALUE="Q", RC=STATUS )
VERIFY_(STATUS)
call MAPL_FieldBundleAdd (BUNDLE, FIELD, RC=STATUS )
VERIFY_(STATUS)
! call ESMF_StateGet (GEX(TURBL), 'QT3' , FIELD, RC=STATUS )
! VERIFY_(STATUS)
! call ESMF_AttributeSet(FIELD, NAME="DiffuseLike" ,VALUE="Q", RC=STATUS )
! VERIFY_(STATUS)
! call MAPL_FieldBundleAdd (BUNDLE, FIELD, RC=STATUS )
! VERIFY_(STATUS)

! Add Friendlies from Physics
call MAPL_GridCompGetFriendlies(GC, "TURBULENCE", BUNDLE, RC=STATUS )
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
! $Id$

#include "MAPL_Generic.h"
!#define PDFDIAG 1

!=============================================================================
!BOP
Expand Down Expand Up @@ -349,6 +350,12 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,: ) :: LS_SNR, CN_SNR, AN_SNR, SC_SNR
real, pointer, dimension(:,:,:) :: PTR3D
real, pointer, dimension(:,: ) :: PTR2D
#ifdef PDFDIAG
real, pointer, dimension(:,:,:) :: PDF_W1, PDF_W2, PDF_SIGW1, PDF_SIGW2, &
PDF_QT1, PDF_QT2, PDF_SIGQT1, PDF_SIGQT2, &
PDF_TH1, PDF_TH2, PDF_SIGTH1, PDF_SIGTH2, &
PDF_RQTTH, PDF_RWTH, PDF_RWQT
#endif

call ESMF_GridCompGet( GC, CONFIG=CF, RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -592,6 +599,24 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
call MAPL_GetPointer(EXPORT, WTHV2, 'WTHV2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, WQL, 'WQL' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)

#ifdef PDFDIAG
call MAPL_GetPointer(EXPORT, PDF_W1, 'PDF_W1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_W2, 'PDF_W2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW1, 'PDF_SIGW1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW2, 'PDF_SIGW2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT1, 'PDF_QT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT2, 'PDF_QT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT1, 'PDF_SIGQT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT2, 'PDF_SIGQT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH1, 'PDF_TH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH2, 'PDF_TH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH1, 'PDF_SIGTH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH2, 'PDF_SIGTH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RQTTH, 'PDF_RQTTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWTH, 'PDF_RWTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWQT, 'PDF_RWQT' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
#endif

call PROGNO_CLOUD ( &
IM*JM, LM , &
DT_MOIST , &
Expand Down Expand Up @@ -690,6 +715,12 @@ subroutine BACM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
VFALLRN_AN , VFALLRN_LS ,VFALLRN_CN ,VFALLRN_SC , &
PDF_A, PDFITERS, &
DQVDT_macro, DQLDT_macro, DQIDT_macro, DQADT_macro, &
#ifdef PDFDIAG
PDF_SIGW1, PDF_SIGW2, PDF_W1, PDF_W2, &
PDF_SIGTH1, PDF_SIGTH2, PDF_TH1, PDF_TH2, &
PDF_SIGQT1, PDF_SIGQT2, PDF_QT1, PDF_QT2, &
PDF_RQTTH, PDF_RWTH, PDF_RWQT, &
#endif
WTHV2, WQL, &
NACTL, &
NACTI, &
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
! $Id$

#include "MAPL_Generic.h"
!#define PDFDIAG 1

!=============================================================================
!BOP
Expand Down Expand Up @@ -343,6 +344,12 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,:) :: DBZ_MAX, DBZ_1KM, DBZ_TOP, DBZ_M10C
real, pointer, dimension(:,:,:) :: PTR3D
real, pointer, dimension(:,: ) :: PTR2D
#ifdef PDFDIAG
real, pointer, dimension(:,:,:) :: PDF_W1, PDF_W2, PDF_SIGW1, PDF_SIGW2, &
PDF_QT1, PDF_QT2, PDF_SIGQT1, PDF_SIGQT2, &
PDF_TH1, PDF_TH2, PDF_SIGTH1, PDF_SIGTH2, &
PDF_RQTTH, PDF_RWTH, PDF_RWQT
#endif

! Local variables
real :: facEIS
Expand Down Expand Up @@ -540,6 +547,25 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
DQSDT_macro=QSNOW
DQGDT_macro=QGRAUPEL

#ifdef PDFDIAG
call MAPL_GetPointer(EXPORT, PDF_W1, 'PDF_W1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_W2, 'PDF_W2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW1, 'PDF_SIGW1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW2, 'PDF_SIGW2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT1, 'PDF_QT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT2, 'PDF_QT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT1, 'PDF_SIGQT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT2, 'PDF_SIGQT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH1, 'PDF_TH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH2, 'PDF_TH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH1, 'PDF_SIGTH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH2, 'PDF_SIGTH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RQTTH, 'PDF_RQTTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWTH, 'PDF_RWTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWQT, 'PDF_RWQT' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
#endif


! Include shallow precip condensates if present
call MAPL_GetPointer(EXPORT, PTR3D, 'SHLW_PRC3', ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) then
Expand Down Expand Up @@ -613,6 +639,23 @@ subroutine GFDL_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
SL3(I,J,L) , &
PDF_A(I,J,L) , &
PDFITERS(I,J,L), &
#ifdef PDFDIAG
PDF_SIGW1(I,J,L), &
PDF_SIGW2(I,J,L), &
PDF_W1(I,J,L), &
PDF_W2(I,J,L), &
PDF_SIGTH1(I,J,L), &
PDF_SIGTH2(I,J,L), &
PDF_TH1(I,J,L), &
PDF_TH2(I,J,L), &
PDF_SIGQT1(I,J,L), &
PDF_SIGQT2(I,J,L), &
PDF_QT1(I,J,L), &
PDF_QT2(I,J,L), &
PDF_RQTTH(I,J,L), &
PDF_RWTH(I,J,L), &
PDF_RWQT(I,J,L), &
#endif
WTHV2(I,J,L) , &
WQL(I,J,L) , &
.false. , &
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
! $Id$

#include "MAPL_Generic.h"
!#define PDFDIAG 1

!=============================================================================
!BOP
Expand Down Expand Up @@ -507,7 +508,12 @@ subroutine MGB2_2M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,:,:) :: RHCRIT3D
real, pointer, dimension(:,:,:) :: PTR3D
real, pointer, dimension(:,: ) :: PTR2D

#ifdef PDFDIAG
real, pointer, dimension(:,:,:) :: PDF_W1, PDF_W2, PDF_SIGW1, PDF_SIGW2, &
PDF_QT1, PDF_QT2, PDF_SIGQT1, PDF_SIGQT2, &
PDF_TH1, PDF_TH2, PDF_SIGTH1, PDF_SIGTH2, &
PDF_RQTTH, PDF_RWTH, PDF_RWQT
#endif

!2m
real, pointer, dimension(:,:,:) :: SC_ICE, CDNC_NUC, INC_NUC, PFRZ, &
Expand Down Expand Up @@ -1413,6 +1419,23 @@ subroutine MGB2_2M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
DQSDT_macro=QSNOW
DQGDT_macro=QGRAUPEL

#ifdef PDFDIAG
call MAPL_GetPointer(EXPORT, PDF_W1, 'PDF_W1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_W2, 'PDF_W2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW1, 'PDF_SIGW1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW2, 'PDF_SIGW2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT1, 'PDF_QT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT2, 'PDF_QT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT1, 'PDF_SIGQT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT2, 'PDF_SIGQT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH1, 'PDF_TH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH2, 'PDF_TH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH1, 'PDF_SIGTH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH2, 'PDF_SIGTH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RQTTH, 'PDF_RQTTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWTH, 'PDF_RWTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWQT, 'PDF_RWQT' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
#endif

! Include shallow precip condensates if present
call MAPL_GetPointer(EXPORT, PTR3D, 'SHLW_PRC3', RC=STATUS); VERIFY_(STATUS)
Expand Down Expand Up @@ -1473,6 +1496,23 @@ subroutine MGB2_2M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
SL3(I,J,L) , &
PDF_A(I,J,L) , &
PDFITERS(I,J,L), &
#ifdef PDFDIAG
PDF_SIGW1(I,J,L), &
PDF_SIGW2(I,J,L), &
PDF_W1(I,J,L), &
PDF_W2(I,J,L), &
PDF_SIGTH1(I,J,L), &
PDF_SIGTH2(I,J,L), &
PDF_TH1(I,J,L), &
PDF_TH2(I,J,L), &
PDF_SIGQT1(I,J,L), &
PDF_SIGQT2(I,J,L), &
PDF_QT1(I,J,L), &
PDF_QT2(I,J,L), &
PDF_RQTTH(I,J,L), &
PDF_RWTH(I,J,L), &
PDF_RWQT(I,J,L), &
#endif
WTHV2(I,J,L) , &
WQL(I,J,L) , &
.false. , &
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
! $Id$

#include "MAPL_Generic.h"
!#define PDFDIAG 1

!=============================================================================
!BOP
Expand Down Expand Up @@ -353,6 +354,13 @@ subroutine THOM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
real, pointer, dimension(:,:,:) :: DBZ3D
real, pointer, dimension(:,:,:) :: PTR3D
real, pointer, dimension(:,: ) :: PTR2D
#ifdef PDFDIAG
real, pointer, dimension(:,:,:) :: PDF_W1, PDF_W2, PDF_SIGW1, PDF_SIGW2, &
PDF_QT1, PDF_QT2, PDF_SIGQT1, PDF_SIGQT2, &
PDF_TH1, PDF_TH2, PDF_SIGTH1, PDF_SIGTH2, &
PDF_RQTTH, PDF_RWTH, PDF_RWQT
#endif

! Thompson Pointers for inputs
real, dimension(:,:,:), allocatable, target :: inputs
real, dimension(:,:,:), pointer :: qv => null()
Expand Down Expand Up @@ -679,6 +687,24 @@ subroutine THOM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
DQSDT_macro=QSNOW
DQGDT_macro=QGRAUPEL

#ifdef PDFDIAG
call MAPL_GetPointer(EXPORT, PDF_W1, 'PDF_W1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_W2, 'PDF_W2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW1, 'PDF_SIGW1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGW2, 'PDF_SIGW2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT1, 'PDF_QT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_QT2, 'PDF_QT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT1, 'PDF_SIGQT1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGQT2, 'PDF_SIGQT2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH1, 'PDF_TH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_TH2, 'PDF_TH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH1, 'PDF_SIGTH1' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_SIGTH2, 'PDF_SIGTH2' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RQTTH, 'PDF_RQTTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWTH, 'PDF_RWTH' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
call MAPL_GetPointer(EXPORT, PDF_RWQT, 'PDF_RWQT' , ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
#endif

! Include shallow precip condensates if present
call MAPL_GetPointer(EXPORT, PTR3D, 'SHLW_PRC3', ALLOC=.TRUE., RC=STATUS); VERIFY_(STATUS)
if (associated(PTR3D)) then
Expand Down Expand Up @@ -751,6 +777,23 @@ subroutine THOM_1M_Run (GC, IMPORT, EXPORT, CLOCK, RC)
SL3(I,J,L) , &
PDF_A(I,J,L) , &
PDFITERS(I,J,L), &
#ifdef PDFDIAG
PDF_SIGW1(I,J,L), &
PDF_SIGW2(I,J,L), &
PDF_W1(I,J,L), &
PDF_W2(I,J,L), &
PDF_SIGTH1(I,J,L), &
PDF_SIGTH2(I,J,L), &
PDF_TH1(I,J,L), &
PDF_TH2(I,J,L), &
PDF_SIGQT1(I,J,L), &
PDF_SIGQT2(I,J,L), &
PDF_QT1(I,J,L), &
PDF_QT2(I,J,L), &
PDF_RQTTH(I,J,L), &
PDF_RWTH(I,J,L), &
PDF_RWQT(I,J,L), &
#endif
WTHV2(I,J,L) , &
WQL(I,J,L) , &
.false. , &
Expand Down
Loading