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.

Sign up for GitHub

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

New Velocity Potential and Stream Function Calculations #1072

Merged
merged 41 commits into from
Jan 10, 2025
Merged

New Velocity Potential and Stream Function Calculations #1072

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
26aaeb0
add spectral strm and vpot at 200mb for SFS
KarinaAsmar-NOAA Oct 21, 2024
6401b6f
Merge branch 'NOAA-EMC:develop' into spectral_strm_vpot
KarinaAsmar-NOAA Nov 21, 2024
21c43db
replace full domain spectral with parallelized numerical computation …
KarinaAsmar-NOAA Nov 21, 2024
7609b03
add modelname==GFS condition and update author documentation
KarinaAsmar-NOAA Nov 22, 2024
31cc868
add authors calchipsi
KarinaAsmar-NOAA Nov 22, 2024
a5d8a77
add endif for GFS model block
KarinaAsmar-NOAA Nov 22, 2024
3751656
Merge branch 'develop' into spectral_strm_vpot
WenMeng-NOAA Dec 2, 2024
5134bae
remove uslp/vslp
KarinaAsmar-NOAA Dec 4, 2024
98d0ac1
add j kenyon log
KarinaAsmar-NOAA Dec 4, 2024
fd8abf2
fix: add submodelname to calvor parameters
KarinaAsmar-NOAA Dec 4, 2024
4627df4
remove deallocate from calvor
KarinaAsmar-NOAA Dec 4, 2024
f88bf42
uncomment deallocate in calvor
KarinaAsmar-NOAA Dec 4, 2024
3a23704
comment out smoothing of strm/vpot
KarinaAsmar-NOAA Dec 4, 2024
3663129
add modelname=GFS for 1021/1022 variables
KarinaAsmar-NOAA Dec 4, 2024
740cba9
fix space typo in . and.
KarinaAsmar-NOAA Dec 4, 2024
49bb1a2
remove smoothing function for strm/vpot
KarinaAsmar-NOAA Dec 4, 2024
c62f225
remove modelname==GFS if block from calchipsi
KarinaAsmar-NOAA Dec 4, 2024
6a8aa87
remove commented lines for npass and j loop
KarinaAsmar-NOAA Dec 4, 2024
d4889eb
fix comments, indentations for standardized format
KarinaAsmar-NOAA Dec 4, 2024
808bc84
compute absv and div factors before poisson loops
KarinaAsmar-NOAA Dec 6, 2024
c411af5
remove if lvls block for psichi
KarinaAsmar-NOAA Dec 6, 2024
b67fb2c
clean up debugging code: remove timers and prints for poisson solver
KarinaAsmar-NOAA Dec 6, 2024
19c17e6
restore if lvls block for psichi
KarinaAsmar-NOAA Dec 9, 2024
42326bc
add omp parallel for ATMP,DTMP loops
KarinaAsmar-NOAA Dec 9, 2024
2fc3428
remove mpi_allreduce, reduce poisson loops and parallelize them
KarinaAsmar-NOAA Dec 17, 2024
ffe0f98
remove omp parallel for psi/chi blocks, change blocks to lowercase
KarinaAsmar-NOAA Dec 17, 2024
2fdc0db
add REALX times print after chi loop, with mpi_wtime() calls
KarinaAsmar-NOAA Dec 23, 2024
36619c6
restore mpi_allreduce with mpi_comm_comp (replacing mpi_comm_world)
KarinaAsmar-NOAA Dec 24, 2024
eebe362
merge with upstream/develop
KarinaAsmar-NOAA Dec 24, 2024
83d9d19
fixes: restore err=0, pval initialized, fix psi-to-chi typo
KarinaAsmar-NOAA Jan 2, 2025
211beb2
Merge branch 'develop' into spectral_strm_vpot
WenMeng-NOAA Jan 3, 2025
55b7d42
change to all lowercase
KarinaAsmar-NOAA Jan 6, 2025
6da4a1e
typo fix
KarinaAsmar-NOAA Jan 6, 2025
1c52b4f
fix lowecase
KarinaAsmar-NOAA Jan 6, 2025
2dd9a9f
change var names to ISOBARIC_SFC
KarinaAsmar-NOAA Jan 6, 2025
355af8f
Merge branch 'spectral_strm_vpot' of https://github.com/KarinaAsmar-N…
KarinaAsmar-NOAA Jan 6, 2025
4675c4b
comment out debug code
KarinaAsmar-NOAA Jan 6, 2025
d29834b
comment out mpi timers
KarinaAsmar-NOAA Jan 6, 2025
ed408e3
add hera RT log
FernandoAndrade-NOAA Jan 8, 2025
a5f86de
add hercules rt log
gspetro-NOAA Jan 9, 2025
a7b85cd
add orion rt log
gspetro-NOAA Jan 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions parm/post_avblflds.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8479,5 +8479,21 @@
<scale>3.0</scale>
</param>

<param>
<post_avblfldidx>1021</post_avblfldidx>
<shortname>VPOT_ON_ISOBARIC_SFC_FROM_WIND_FLD</shortname>
WenMeng-NOAA marked this conversation as resolved.
Show resolved Hide resolved
<pname>VPOT</pname>
<fixed_sfc1_type>isobaric_sfc</fixed_sfc1_type>
<scale>3.0</scale>
</param>

<param>
<post_avblfldidx>1022</post_avblfldidx>
<shortname>STRM_ON_ISOBARIC_SFC_FROM_WIND_FLD</shortname>
WenMeng-NOAA marked this conversation as resolved.
Show resolved Hide resolved
<pname>STRM</pname>
<fixed_sfc1_type>isobaric_sfc</fixed_sfc1_type>
<scale>3.0</scale>
</param>

</post_avblflds>
</postxml>
12 changes: 12 additions & 0 deletions parm/sfs/postcntrl_sfs.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@
<scale>5.0</scale>
</param>

<param>
<shortname>VPOT_ON_ISOBARIC_SFC_FROM_WIND_FLD</shortname>
<level>20000.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>STRM_ON_ISOBARIC_SFC_FROM_WIND_FLD</shortname>
<level>20000.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>MSLET_ON_MEAN_SEA_LVL</shortname>
<scale>6.0</scale>
Expand Down
86 changes: 85 additions & 1 deletion parm/sfs/postxconfig-NT-sfs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
1
114
116
GFSPRS
0
ncep_nco
Expand Down Expand Up @@ -352,6 +352,90 @@ isobaric_sfc
?
?
?
1021
VPOT_ON_ISOBARIC_SFC_FROM_WIND_FLD
?
1
tmpl4_0
VPOT
?
?
isobaric_sfc
0
?
1
20000.
?
0
?
0
?
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
0
0.0
0
0.0
1
3.0
0
0
0
?
?
?
1022
STRM_ON_ISOBARIC_SFC_FROM_WIND_FLD
?
1
tmpl4_0
STRM
?
?
isobaric_sfc
0
?
1
20000.
?
0
?
0
?
?
?
?
0
0.0
0
0.0
?
0
0.0
0
0.0
0
0.0
0
0.0
1
3.0
0
0
0
?
?
?
23
MSLET_ON_MEAN_SEA_LVL
?
Expand Down
63 changes: 62 additions & 1 deletion sorc/ncep_post.fd/MDL2P.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
!> 2023-08-24 | Y Mao | Add gtg_on option for GTG interpolation
!> 2023-09-12 | J Kenyon | Prevent spurious supercooled rain and cloud water
!> 2024-04-23 | E James | Adding smoke emissions (ebb) from RRFS
!> 2024-09-23 | K Asmar | Add velocity potential and streamfunction from wind vectors
!> 2024-12-12 | J Meng | Adding UUtah 2024 SLR algorithm
!>
!> @author T Black W/NP2 @date 1999-09-23
Expand Down Expand Up @@ -77,7 +78,7 @@ SUBROUTINE MDL2P(iostatusD3D)
use rqstfld_mod, only: IGET, LVLS, ID, IAVBLFLD, LVLSXML
use gridspec_mod, only: GRIDTYPE, MAPTYPE, DXVAL
use upp_physics, only: FPVSNEW, CALRH, CALVOR, CALSLR_ROEBBER, CALSLR_UUTAH, &
CALSLR_UUTAH2
CALSLR_UUTAH2, CALCHIPSI

!- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
!
Expand Down Expand Up @@ -109,6 +110,7 @@ SUBROUTINE MDL2P(iostatusD3D)
INTEGER, dimension(ista_2l:iend_2u,jsta_2l:jend_2u) :: NL1X, NL1XF
real, dimension(ISTA_2L:IEND_2U,JSTA_2L:JEND_2U,LSM) :: TPRS, QPRS, FPRS
real, dimension(ISTA_2L:IEND_2U,JSTA_2L:JEND_2U,LSM) :: RHPRS
real, dimension(ista_2l:iend_2u,jsta_2l:jend_2u) :: CHI, PSI
!
INTEGER K, NSMOOTH
!
Expand Down Expand Up @@ -230,6 +232,7 @@ SUBROUTINE MDL2P(iostatusD3D)
(IGET(257) > 0) .OR. (IGET(258) > 0) .OR. &
(IGET(294) > 0) .OR. (IGET(268) > 0) .OR. &
(IGET(331) > 0) .OR. (IGET(326) > 0) .OR. &
(IGET(1021) > 0) .OR. (IGET(1022) > 0) .OR. &
! add D3D fields
(IGET(354) > 0) .OR. (IGET(355) > 0) .OR. &
(IGET(356) > 0) .OR. (IGET(357) > 0) .OR. &
Expand Down Expand Up @@ -1818,6 +1821,64 @@ SUBROUTINE MDL2P(iostatusD3D)
ENDIF
ENDIF
!
!*** STREAMFUNCTION (PSI) AND VELOCITY POTENTIAL (CHI)
!
IF ( (IGET(1021) > 0 .or. IGET(1022) > 0) .and. MODELNAME == 'GFS' ) THEN
IF (LVLS(LP,IGET(1021)) > 0 .or. LVLS(LP,IGET(1022)) > 0) THEN
WenMeng-NOAA marked this conversation as resolved.
Show resolved Hide resolved
CALL CALCHIPSI(USL,VSL,CHI,PSI)
! print *,'me=',me,'EGRID1=',EGRID1(1:10,JSTA)
!
!*** CHI
!
IF (LVLS(LP,IGET(1021)) > 0) THEN
!$omp parallel do private(i,j)
DO J=JSTA,JEND
DO I=ISTA,IEND
GRID1(I,J) = CHI(I,J)
ENDDO
ENDDO
if(grib == 'grib2')then
cfld = cfld + 1
fld_info(cfld)%ifld=IAVBLFLD(IGET(1021))
fld_info(cfld)%lvl=LVLSXML(LP,IGET(1021))
!$omp parallel do private(i,j,ii,jj)
do j=1,jend-jsta+1
jj = jsta+j-1
do i=1,iend-ista+1
ii=ista+i-1
datapd(i,j,cfld) = GRID1(ii,jj)
enddo
enddo
endif
ENDIF !CHI
!
!*** PSI
!
IF (LVLS(LP,IGET(1022)) > 0) THEN
!$omp parallel do private(i,j)
DO J=JSTA,JEND
DO I=ISTA,IEND
GRID1(I,J) = PSI(I,J)
ENDDO
ENDDO
if(grib == 'grib2')then
cfld = cfld + 1
fld_info(cfld)%ifld=IAVBLFLD(IGET(1022))
fld_info(cfld)%lvl=LVLSXML(LP,IGET(1022))
!$omp parallel do private(i,j,ii,jj)
do j=1,jend-jsta+1
jj = jsta+j-1
do i=1,iend-ista+1
ii=ista+i-1
datapd(i,j,cfld) = GRID1(ii,jj)
enddo
enddo
endif
ENDIF !PSI
ENDIF !LVLS(CHIPSI)
ENDIF !CHIPSI
!
!
! GEOSTROPHIC STREAMFUNCTION.
IF (IGET(086) > 0) THEN
IF (LVLS(LP,IGET(086)) > 0) THEN
Expand Down
Loading