Skip to content

Register diagnostics from stochastic physics only if allocated, fix duplicate symbols error on macOS; ccpp-physics: cleanup CCPP cmake flags part 1; contains "fix the number of 2d fields nsfcprop2d" (#419) #417

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
junwang-noaa merged 14 commits into from
Nov 12, 2021
Merged

Register diagnostics from stochastic physics only if allocated, fix duplicate symbols error on macOS; ccpp-physics: cleanup CCPP cmake flags part 1; contains "fix the number of 2d fields nsfcprop2d" (#419) #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
32d7440
Update .gitmodules and submodule pointer for ccpp-physics
climbfuji Oct 6, 2021
c17ceb3
Only register diagnostic output of stochastic physics variables when …
climbfuji Nov 4, 2021
3004b10
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fix…
climbfuji Nov 4, 2021
119394e
Remove files that are added automatically by CCPP from ccpp/CMakeList…
climbfuji Nov 4, 2021
df04065
Update submodule pointer for ccpp-physics
climbfuji Nov 4, 2021
80ae93a
fix the number of 2d fields nsfcprop2d
Nov 6, 2021
5f64b61
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Nov 8, 2021
eba32f9
Merge branch 'fix_stochastic_diag_output' of https://github.com/climb…
climbfuji Nov 8, 2021
b8c3733
Update submodule pointer for ccpp-physics
climbfuji Nov 8, 2021
5bde5b8
Merge branch 'nsfcprop2d_fix' of https://github.com/HelinWei-NOAA/fv3…
climbfuji Nov 9, 2021
2980441
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fix…
climbfuji Nov 10, 2021
37efffe
Update submodule pointer for atmos_cubed_sphere to include latest JED…
climbfuji Nov 10, 2021
0172548
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fix…
climbfuji Nov 10, 2021
eca5f85
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Nov 11, 2021
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
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Open in desktop
Submodule atmos_cubed_sphere updated 1 files
+16 −4 model/fv_control.F90
4 changes: 0 additions & 4 deletions ccpp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ add_subdirectory(physics)
add_library(
fv3ccpp

data/CCPP_typedefs.F90
data/GFS_typedefs.F90
data/CCPP_data.F90

driver/GFS_diagnostics.F90
driver/GFS_restart.F90
driver/GFS_init.F90
Expand Down
2 changes: 1 addition & 1 deletion ccpp/data/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2929,7 +2929,7 @@ subroutine coupling_create (Coupling, IM, Model)
endif

!--- stochastic physics option
if (Model%do_sppt .or. Model%ca_global)then
if (Model%do_sppt .or. Model%ca_global) then
allocate (Coupling%sppt_wts (IM,Model%levs))
Coupling%sppt_wts = clear_val
endif
Expand Down
250 changes: 130 additions & 120 deletions ccpp/driver/GFS_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2031,27 +2031,29 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
enddo
endif

idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'skebu_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%skebu_wts(:,:)
enddo
if (Model%do_skeb) then
idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'skebu_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%skebu_wts(:,:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'skebv_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%skebv_wts(:,:)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'skebv_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%skebv_wts(:,:)
enddo
endif

idx = idx + 1
ExtDiag(idx)%axes = 2
Expand Down Expand Up @@ -2085,115 +2087,123 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
ExtDiag(idx)%data(nb)%var2 => IntDiag(nb)%refdmax263k(:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'sppt_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%sppt_wts(:,:)
enddo
if (Model%do_sppt .or. Model%ca_global) then
idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'sppt_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%sppt_wts(:,:)
enddo
endif

idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'shum_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%shum_wts(:,:)
enddo
if (Model%do_shum) then
idx = idx + 1
ExtDiag(idx)%axes = 3
ExtDiag(idx)%name = 'shum_wts'
ExtDiag(idx)%desc = 'perturbation velocity'
ExtDiag(idx)%unit = 'm/s'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var3 => Coupling(nb)%shum_wts(:,:)
enddo
endif

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sfc_wts1'
ExtDiag(idx)%desc = 'perturbation amplitude'
ExtDiag(idx)%unit = 'none'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%sfc_wts(:,1)
enddo
if (Model%lndp_type /= 0) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sfc_wts1'
ExtDiag(idx)%desc = 'perturbation amplitude'
ExtDiag(idx)%unit = 'none'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%sfc_wts(:,1)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sfc_wts2'
ExtDiag(idx)%desc = 'perturbation amplitude'
ExtDiag(idx)%unit = 'none'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%sfc_wts(:,2)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'sfc_wts2'
ExtDiag(idx)%desc = 'perturbation amplitude'
ExtDiag(idx)%unit = 'none'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%sfc_wts(:,2)
enddo
endif

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca1'
ExtDiag(idx)%desc = 'Cellular Automata'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca1(:)
enddo
if (Model%do_ca) then
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca1'
ExtDiag(idx)%desc = 'Cellular Automata'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca1(:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_deep'
ExtDiag(idx)%desc = 'CA deep conv'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_deep(:)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_deep'
ExtDiag(idx)%desc = 'CA deep conv'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_deep(:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_turb'
ExtDiag(idx)%desc = 'CA turbulence'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_turb(:)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_turb'
ExtDiag(idx)%desc = 'CA turbulence'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_turb(:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_shal'
ExtDiag(idx)%desc = 'CA shallow conv'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_shal(:)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_shal'
ExtDiag(idx)%desc = 'CA shallow conv'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_shal(:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_rad'
ExtDiag(idx)%desc = 'CA radiation'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_rad(:)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_rad'
ExtDiag(idx)%desc = 'CA radiation'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_rad(:)
enddo

idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_micro'
ExtDiag(idx)%desc = 'CA microphys'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_micro(:)
enddo
idx = idx + 1
ExtDiag(idx)%axes = 2
ExtDiag(idx)%name = 'ca_micro'
ExtDiag(idx)%desc = 'CA microphys'
ExtDiag(idx)%unit = '%'
ExtDiag(idx)%mod_name = 'gfs_phys'
allocate (ExtDiag(idx)%data(nblks))
do nb = 1,nblks
ExtDiag(idx)%data(nb)%var2 => Coupling(nb)%ca_micro(:)
enddo
endif

if (Model%ldiag_ugwp) THEN
!
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 3 files
+1 −61 CMakeLists.txt
+1 −1 CODEOWNERS
+15 −7 README.md
30 changes: 20 additions & 10 deletions io/FV3GFS_io.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,15 +175,25 @@ subroutine FV3GFS_GFS_checksum (Model, GFS_Data, Atm_block)

ntr = size(GFS_Data(1)%Statein%qgrs,3)

nsfcprop2d = 93
if (Model%lsm == Model%lsm_noahmp) then
nsfcprop2d = 156
nsfcprop2d = nsfcprop2d + 49
if (Model%use_cice_alb) then
nsfcprop2d = nsfcprop2d + 4
endif
elseif (Model%lsm == Model%lsm_ruc) then
nsfcprop2d = 125
nsfcprop2d = nsfcprop2d + 4 + 12
if (Model%rdlai) then
nsfcprop2d = nsfcprop2d + 1
endif
else
nsfcprop2d = 107
if (Model%use_cice_alb) then
nsfcprop2d = nsfcprop2d + 4
endif
endif

if (Model%nstf_name(1) > 0) then
nsfcprop2d = nsfcprop2d + 16
endif

allocate (temp2d(isc:iec,jsc:jec,nsfcprop2d+Model%ntot3d+Model%nctp))
Expand Down Expand Up @@ -316,14 +326,14 @@ subroutine FV3GFS_GFS_checksum (Model, GFS_Data, Atm_block)
temp2d(i,j,92) = GFS_Data(nb)%Sfcprop%emis_ice(ix)
temp2d(i,j,93) = GFS_Data(nb)%Sfcprop%sncovr_ice(ix)

idx_opt = 93
idx_opt = 94
if (Model%use_cice_alb .or. Model%lsm == Model%lsm_ruc) then
temp2d(i,j,idx_opt+1) = GFS_Data(nb)%Sfcprop%albdirvis_ice(ix)
temp2d(i,j,idx_opt+2) = GFS_Data(nb)%Sfcprop%albdirnir_ice(ix)
temp2d(i,j,idx_opt+3) = GFS_Data(nb)%Sfcprop%albdifvis_ice(ix)
temp2d(i,j,idx_opt+4) = GFS_Data(nb)%Sfcprop%albdifnir_ice(ix)
temp2d(i,j,idx_opt) = GFS_Data(nb)%Sfcprop%albdirvis_ice(ix)
temp2d(i,j,idx_opt+1) = GFS_Data(nb)%Sfcprop%albdirnir_ice(ix)
temp2d(i,j,idx_opt+2) = GFS_Data(nb)%Sfcprop%albdifvis_ice(ix)
temp2d(i,j,idx_opt+3) = GFS_Data(nb)%Sfcprop%albdifnir_ice(ix)
idx_opt = idx_opt + 4
endif
idx_opt = idx_opt + 5

if (Model%lsm == Model%lsm_noahmp) then
temp2d(i,j,idx_opt) = GFS_Data(nb)%Sfcprop%snowxy(ix)
Expand Down Expand Up @@ -390,7 +400,7 @@ subroutine FV3GFS_GFS_checksum (Model, GFS_Data, Atm_block)
temp2d(i,j,idx_opt+9) = GFS_Data(nb)%Sfcprop%sfalb_lnd(ix)
temp2d(i,j,idx_opt+10) = GFS_Data(nb)%Sfcprop%sfalb_lnd_bck(ix)
temp2d(i,j,idx_opt+11) = GFS_Data(nb)%Sfcprop%sfalb_ice(ix)
idx_opt = idx_opt + 11
idx_opt = idx_opt + 12
if (Model%rdlai) then
temp2d(i,j,idx_opt+1) = GFS_Data(nb)%Sfcprop%xlaixy(ix)
idx_opt = idx_opt + 1
Expand Down