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

Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types #508

Merged
merged 9 commits into from
Apr 12, 2022
Merged

Split GFS_typedefs.F90, rename CCPP_interstitial, import ccpp_t from ccpp_types #508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3f7ee74
Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere…
climbfuji Mar 20, 2022
f12817f
Split GFS_typedefs.F90: move GFS_interstitial_type to CCPP_typedefs.F…
climbfuji Mar 20, 2022
cccf5f7
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Mar 27, 2022
333819e
Add bugfix in ccpp/data/GFS_typedefs.meta: mark input_nml_file as act…
climbfuji Apr 4, 2022
b774083
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Apr 4, 2022
3045104
Update submodule pointers for ccpp-framework and ccpp-physics
climbfuji Apr 11, 2022
e80b0d5
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Apr 11, 2022
516c8fb
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
climbfuji Apr 11, 2022
56090d2
Revert .gitmodules and update submodule pointers for GFDL_atmos_cubed…
climbfuji Apr 12, 2022
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 3 files
+2 −2 driver/fvGFS/atmosphere.F90
+8 −8 model/fv_dynamics.F90
+6 −6 model/fv_mapz.F90
4 changes: 2 additions & 2 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@
'module_radlw_parameters' : '',
},
'CCPP_typedefs' : {
'CCPP_interstitial_type' : 'CCPP_interstitial',
'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
'GFDL_interstitial_type' : 'GFDL_interstitial',
'CCPP_typedefs' : '',
},
'CCPP_data' : {
'CCPP_data' : '',
},
'GFS_typedefs' : {
'GFS_control_type' : 'GFS_Control',
'GFS_interstitial_type' : 'GFS_Interstitial(cdata%thrd_no)',
'GFS_data_type' : 'GFS_Data(cdata%blk_no)',
'GFS_diag_type' : 'GFS_Data(cdata%blk_no)%Intdiag',
'GFS_tbd_type' : 'GFS_Data(cdata%blk_no)%Tbd',
Expand Down
10 changes: 5 additions & 5 deletions ccpp/data/CCPP_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ module CCPP_data
!!

use ccpp_types, only: ccpp_t
use CCPP_typedefs, only: CCPP_interstitial_type
use CCPP_typedefs, only: GFS_interstitial_type, &
GFDL_interstitial_type
use GFS_typedefs, only: GFS_control_type, &
GFS_data_type, &
GFS_interstitial_type
GFS_data_type

implicit none

Expand All @@ -18,7 +18,7 @@ module CCPP_data
cdata_domain, &
cdata_block, &
ccpp_suite, &
CCPP_interstitial, &
GFDL_interstitial, &
GFS_control, &
GFS_data, &
GFS_interstitial
Expand All @@ -34,7 +34,7 @@ module CCPP_data
!------------------------------------------------------!
! CCPP data containers for dynamics (fast physics) !
!------------------------------------------------------!
type(CCPP_interstitial_type), save, target :: CCPP_interstitial
type(GFDL_interstitial_type), save, target :: GFDL_interstitial

!------------------------------------------------------!
! CCPP containers for the six tiles used in dynamics, !
Expand Down
8 changes: 4 additions & 4 deletions ccpp/data/CCPP_data.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@
units = DDT
dimensions = ()
type = ccpp_t
[CCPP_interstitial]
standard_name = CCPP_interstitial_type_instance
long_name = instance of derived type CCPP_interstitial_type
[GFDL_interstitial]
standard_name = GFDL_interstitial_type_instance
long_name = instance of derived type GFDL_interstitial_type
units = DDT
dimensions = ()
type = CCPP_interstitial_type
type = GFDL_interstitial_type
[GFS_Control]
standard_name = GFS_control_type_instance
long_name = instance of derived type GFS_control_type
Expand Down
1,597 changes: 1,565 additions & 32 deletions ccpp/data/CCPP_typedefs.F90
View file
Open in desktop

Large diffs are not rendered by default.

Loading