Skip to content

Commit

Permalink
Capgen SCM build workinggit statusgit status
Browse files Browse the repository at this point in the history
  • Loading branch information
@dustinswales
dustinswales committed Sep 26, 2024
1 parent d863dbb commit 3ec06c9
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 110 deletions.
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 8 files
+8 −1 scripts/ccpp_capgen.py
+7 −3 scripts/ddt_library.py
+0 −12 scripts/fortran_tools/parse_fortran_file.py
+50 −1 scripts/metadata_table.py
+22 −2 scripts/metavar.py
+79 −61 scripts/suite_objects.py
+1 −1 src/CMakeLists.txt
+0 −6 src/ccpp_types.meta
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 16 files
+16 −9 CMakeLists.txt
+1 −0 physics/CONV/Grell_Freitas/cu_gf_driver.meta
+1 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta
+0 −24 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta
+0 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta
+1 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta
+2 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.meta
+2 −2 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.meta
+1 −1 physics/MP/NSSL/mp_nssl.meta
+4 −2 physics/MP/Thompson/mp_thompson.meta
+1 −1 physics/Radiation/RRTMG/radlw_param.meta
+1 −1 physics/Radiation/RRTMG/radsw_param.meta
+1 −0 physics/Radiation/RRTMGP/rrtmgp_lw_main.meta
+2 −1 physics/Radiation/RRTMGP/rrtmgp_sw_main.meta
+1 −1 physics/smoke_dust/rrfs_smoke_wrapper.meta
+1 −1 physics/tools/get_phi_fv3.meta
2 changes: 0 additions & 2 deletions scm/src/CCPP_typedefs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,6 @@ module CCPP_typedefs

end type GFS_interstitial_type

type(GFS_interstitial_type) :: GFS_interstitial_type_instance

contains

!----------------------
Expand Down
6 changes: 0 additions & 6 deletions scm/src/CCPP_typedefs.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3014,9 +3014,3 @@
units = count
dimensions = ()
type = integer
[GFS_interstitial_type_instance]
standard_name = GFS_interstitial_type_instance
long_name = instance of type GFS_interstitial_type
units = DDT
dimensions = ()
type = GFS_interstitial_type
26 changes: 7 additions & 19 deletions scm/src/GFS_typedefs.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2197,24 +2197,12 @@ module GFS_typedefs
! PUBLIC ENTITIES
!----------------

type(GFS_init_type) :: GFS_init_type_instance
type(GFS_statein_type) :: GFS_statein_type_instance
type(GFS_stateout_type) :: GFS_stateout_type_instance
type(GFS_sfcprop_type) :: GFS_sfcprop_type_instance
type(GFS_coupling_type) :: GFS_coupling_type_instance
type(GFS_control_type) :: GFS_control_type_instance
type(GFS_grid_type) :: GFS_grid_type_instance
type(GFS_tbd_type) :: GFS_tbd_type_instance
type(GFS_cldprop_type) :: GFS_cldprop_type_instance
type(GFS_radtend_type) :: GFS_radtend_type_instance
type(GFS_diag_type) :: GFS_diag_type_instance

public GFS_init_type_instance
public GFS_statein_type_instance, GFS_stateout_type_instance, GFS_sfcprop_type_instance, &
GFS_coupling_type_instance
public GFS_control_type_instance, GFS_grid_type_instance, GFS_tbd_type_instance, &
GFS_cldprop_type_instance, GFS_radtend_type_instance, GFS_diag_type_instance

public GFS_init_type
public GFS_statein_type, GFS_stateout_type, GFS_sfcprop_type, &
GFS_coupling_type
public GFS_control_type, GFS_grid_type, GFS_tbd_type, &
GFS_cldprop_type, GFS_radtend_type, GFS_diag_type

!*******************************************************************************************
CONTAINS

Expand Down Expand Up @@ -3297,7 +3285,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
use physcons, only: con_rerth, con_pi, con_p0, rhowater
use mersenne_twister, only: random_setseed, random_number
use parse_tracers, only: get_tracer_index
! use GFS_ccpp_suite_sim_pre, only: load_ccpp_suite_sim
use GFS_ccpp_suite_sim_pre, only: load_ccpp_suite_sim
!
implicit none

Expand Down
67 changes: 1 addition & 66 deletions scm/src/GFS_typedefs.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10154,76 +10154,11 @@
dependencies = photochem/h2o_def.f,photochem/module_ozphys.F90
dependencies = MP/GFDL/GFDL_parse_tracers.F90
dependencies = Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90
dependencies = Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90

[ccpp-arg-table]
name = GFS_typedefs
type = module
[GFS_init_type]
standard_name = GFS_init_type_instance
long_name = definition of type GFS_init_type
units = DDT
dimensions = ()
type = GFS_init_type
[GFS_cldprop_type_instance]
standard_name = GFS_cldprop_type_instance
long_name = definition of type GFS_cldprop_type
units = DDT
dimensions = ()
type = GFS_cldprop_type
[GFS_control_type_instance]
standard_name = GFS_control_type_instance
long_name = instance of type GFS_control_type
units = DDT
dimensions = ()
type = GFS_control_type
[GFS_coupling_type_instance]
standard_name = GFS_coupling_type_instance
long_name = definition of type GFS_coupling_type
units = DDT
dimensions = ()
type = GFS_coupling_type
[GFS_diag_type_instance]
standard_name = GFS_diag_type_instance
long_name = definition of type GFS_diag_type
units = DDT
dimensions = ()
type = GFS_diag_type
[GFS_grid_type_instance]
standard_name = GFS_grid_type_instance
long_name = definition of type GFS_grid_type
units = DDT
dimensions = ()
type = GFS_grid_type
[GFS_radtend_type_instance]
standard_name = GFS_radtend_type_instance
long_name = definition of type GFS_radtend_type
units = DDT
dimensions = ()
type = GFS_radtend_type
[GFS_sfcprop_type_instance]
standard_name = GFS_sfcprop_type_instance
long_name = definition of type GFS_sfcprop_type
units = DDT
dimensions = ()
type = GFS_sfcprop_type
[GFS_statein_type_instance]
standard_name = GFS_statein_type_instance
long_name = definition of type GFS_statein_type
units = DDT
dimensions = ()
type = GFS_statein_type
[GFS_stateout_type_instance]
standard_name = GFS_stateout_type_instance
long_name = definition of type GFS_stateout_type
units = DDT
dimensions = ()
type = GFS_stateout_type
[GFS_tbd_type_instance]
standard_name = GFS_tbd_type_instance
long_name = definition of type GFS_tbd_type
units = DDT
dimensions = ()
type = GFS_tbd_type
[LTP]
standard_name = extra_top_layer
long_name = extra top layer for radiation
Expand Down
30 changes: 15 additions & 15 deletions scm/src/scm_type_defs.meta
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,73 +38,73 @@
name = physics_type
type = ddt
[Model]
standard_name = GFS_control_type_instance
standard_name = GFS_control_type
long_name = instance of derived type GFS_control_type
units = DDT
dimensions = ()
type = GFS_control_type
[Cldprop]
standard_name = GFS_cldprop_type_instance
standard_name = GFS_cldprop_type
long_name = instance of derived type GFS_cldprop_type
units = DDT
dimensions = ()
type = GFS_cldprop_type
[Coupling]
standard_name = GFS_coupling_type_instance
standard_name = GFS_coupling_type
long_name = instance of derived type GFS_coupling_type
units = DDT
dimensions = ()
type = GFS_coupling_type
[Diag]
standard_name = GFS_diag_type_instance
standard_name = GFS_diag_type
long_name = instance of derived type GFS_diag_type
units = DDT
dimensions = ()
type = GFS_diag_type
[Grid]
standard_name = GFS_grid_type_instance
standard_name = GFS_grid_type
long_name = instance of derived type GFS_grid_type
units = DDT
dimensions = ()
type = GFS_grid_type
[Radtend]
standard_name = GFS_radtend_type_instance
standard_name = GFS_radtend_type
long_name = instance of derived type GFS_radtend_type
units = DDT
dimensions = ()
type = GFS_radtend_type
[Sfcprop]
standard_name = GFS_sfcprop_type_instance
standard_name = GFS_sfcprop_type
long_name = instance of derived type GFS_sfcprop_type
units = DDT
dimensions = ()
type = GFS_sfcprop_type
[Statein]
standard_name = GFS_statein_type_instance
standard_name = GFS_statein_type
long_name = instance of derived type GFS_statein_type
units = DDT
dimensions = ()
type = GFS_statein_type
[Stateout]
standard_name = GFS_stateout_type_instance
standard_name = GFS_stateout_type
long_name = instance of derived type GFS_stateout_type
units = DDT
dimensions = ()
type = GFS_stateout_type
[Tbd]
standard_name = GFS_tbd_type_instance
standard_name = GFS_tbd_type
long_name = instance of derived type GFS_tbd_type
units = DDT
dimensions = ()
type = GFS_tbd_type
[Interstitial]
standard_name = GFS_interstitial_type_instance
standard_name = GFS_interstitial_type
long_name = instance of derived type GFS_interstitial_type
units = DDT
dimensions = ()
type = GFS_interstitial_type
[Init_parm]
standard_name = GFS_init_type_instance
standard_name = GFS_init_type
long_name = instance of derived type GFS_init_type
units = DDT
dimensions = ()
Expand All @@ -122,14 +122,14 @@
type = host
[physics]
standard_name = physics_type
long_name = instance of derived data type physics_type
long_name = definition of derived data type physics_type
units = DDT
dimensions = ()
type = physics_type
intent = inout
[ccpp_cfg]
standard_name = ccpp_configuration_instance
long_name = instance of derived data type ccpp_config
standard_name = ccpp_configuration
long_name = definition of derived data type ccpp_config
units = DDT
dimensions = ()
type = ty_ccpp_config
Expand Down

0 comments on commit 3ec06c9

Please sign in to comment.