Skip to content

Rrfs v1 conus13km tests #18

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

Merged
JiliDong-NOAA merged 3 commits into from
Jun 3, 2025
Merged

Rrfs v1 conus13km tests #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03fc30c
Add 'ebu_smoke' to restart if rrfs_sd is enabled
DusanJovic-NOAA Apr 3, 2025
d0d2f98
update ccpp/physics (#10)
JiliDong-NOAA May 21, 2025
26304d7
Acsnow restart fix (#11)
JiliDong-NOAA May 27, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
branch = production/RRFS.v1
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = production/RRFS.v1
# url = https://github.com/ufs-community/ccpp-physics
# branch = production/RRFS.v1
url = https://github.com/JiliDong-NOAA/ccpp-physics
branch = sigmab_restart_fix
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
7 changes: 6 additions & 1 deletion ccpp/driver/GFS_restart.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, &
Restart%num3d = Restart%num3d + 9
endif
if (Model%rrfs_sd) then
Restart%num3d = Restart%num3d + 4
Restart%num3d = Restart%num3d + 5
endif
!Prognostic area fraction
if (Model%progsigma) then
Expand Down Expand Up @@ -690,6 +690,11 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, &
Restart%data(nb,num)%var3p => Coupling(nb)%chem3d(:,:,3)
enddo
num = num + 1
Restart%name3d(num) = 'ebu_smoke'
do nb = 1,nblks
Restart%data(nb,num)%var3p => Coupling(nb)%ebu_smoke(:,:)
enddo
num = num + 1
Restart%name3d(num) = 'ext550'
do nb = 1,nblks
Restart%data(nb,num)%var3p => Radtend(nb)%ext550(:,:)
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 4 files
+2 −1 physics/CONV/SAMF/samfdeepcnv.f
+7 −4 physics/CONV/SAMF/samfshalcnv.f
+7 −0 physics/CONV/SAMF/samfshalcnv.meta
+4 −2 physics/CONV/progsigma_calc.f90
2 changes: 2 additions & 0 deletions io/fv3atm_restart_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,8 @@ subroutine fv3atm_checksum (Model, GFS_Data, Atm_block)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%tsnow_ice)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%snowfallac_land)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%snowfallac_ice)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%acsnow_land)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%acsnow_ice)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%sfalb_lnd)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%sfalb_lnd_bck)
call copy_from_GFS_Data(ii1,jj1,isc,jsc,nt,temp2d,GFS_Data(nb)%Sfcprop%sfalb_ice)
Expand Down
8 changes: 6 additions & 2 deletions io/fv3atm_sfc_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ function Sfc_io_calculate_indices(sfc, Model, reading, warm_start)
endif
if (Model%lsm == Model%lsm_ruc .and. warm_start) then
if (Model%rdlai) then
nvar2r = 13
nvar2r = 15
else
nvar2r = 12
nvar2r = 14
endif
nvar3 = 5
else
Expand Down Expand Up @@ -534,6 +534,8 @@ subroutine Sfc_io_fill_2d_names(sfc,Model,warm_start)
nt=nt+1 ; sfc%name2(nt) = 'tsnow_ice'
nt=nt+1 ; sfc%name2(nt) = 'snowfall_acc_land'
nt=nt+1 ; sfc%name2(nt) = 'snowfall_acc_ice'
nt=nt+1 ; sfc%name2(nt) = 'acsnow_land'
nt=nt+1 ; sfc%name2(nt) = 'acsnow_ice'
nt=nt+1 ; sfc%name2(nt) = 'sfalb_lnd'
nt=nt+1 ; sfc%name2(nt) = 'sfalb_lnd_bck'
nt=nt+1 ; sfc%name2(nt) = 'sfalb_ice'
Expand Down Expand Up @@ -1051,6 +1053,8 @@ subroutine Sfc_io_transfer(sfc, reading, Model, Atm_block, Sfcprop, warm_start,
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%tsnow_ice)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%snowfallac_land)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%snowfallac_ice)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%acsnow_land)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%acsnow_ice)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%sfalb_lnd)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%sfalb_lnd_bck)
call GFS_Data_transfer(reading,ii1,jj1,isc,jsc,nt,sfc%var2,Sfcprop(nb)%sfalb_ice)
Expand Down