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

Capgen in scm #522

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft

Capgen in scm #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c1f2299
Commit before sync
Jan 2, 2024
6b38491
Update .gitmodules
Jan 2, 2024
f40230b
Add v16 scheme/host files
Jan 2, 2024
95dba39
Rename logical switches used by LSM. These switches were the same nam…
dustinswales Jan 30, 2024
e80c6dc
More changes.
dustinswales Jan 30, 2024
fc98959
Move F90 declaration
dustinswales Apr 9, 2024
3371e55
Updated CCPP
dustinswales Apr 9, 2024
615a667
Merge branch 'main' of https://github.com/NCAR/ccpp-scm into capgen_i…
dustinswales Apr 9, 2024
3bc6d60
Commit changes, picking this work back up....
dustinswales Aug 7, 2024
967cb1a
Merge branch 'main' of https://github.com/NCAR/ccpp-scm into capgen_i…
dustinswales Aug 7, 2024
e8b745c
Changes for Capgen in SCM
dustinswales Sep 17, 2024
1d01c6c
Merge branch 'main' of https://github.com/NCAR/ccpp-scm into capgen_i…
dustinswales Sep 17, 2024
50c38bc
More changes. Getting closer!
dustinswales Sep 17, 2024
d863dbb
A few more changes
dustinswales Sep 17, 2024
3ec06c9
Capgen SCM build workinggit statusgit status
dustinswales Sep 26, 2024
6d1fecb
Some changes to SCM CMakeLists
dustinswales Sep 27, 2024
0613d69
Some more changes. Still not running. Work in progress.
dustinswales Sep 30, 2024
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
8 changes: 4 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[submodule "ccpp-framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
url = https://github.com/dustinswales/ccpp-framework
branch = capgen_in_scm
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
url = https://github.com/dustinswales/ccpp-physics
branch = changes_for_capgen
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
11 changes: 11 additions & 0 deletions ccpp/config/host_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
ccpp/physics/physics/hooks/machine.f
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90
ccpp/physics/physics/photochem/h2o_def.f
ccpp/physics/physics/photochem/module_ozphys.F90
ccpp/physics/physics/Radiation/RRTMG/radlw_param.f
ccpp/physics/physics/Radiation/RRTMG/radsw_param.f
scm/src/ccpp_config.F90
scm/src/GFS_typedefs.F90
scm/src/CCPP_typedefs.F90
scm/src/scm_type_defs.F90
scm/src/scm_physical_constants.F90
136 changes: 136 additions & 0 deletions ccpp/config/scheme_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
ccpp/physics/physics/hooks/machine.f
ccpp/physics/physics/hooks/physcons.F90
ccpp/physics/physics/tools/get_prs_fv3.F90
ccpp/physics/physics/tools/get_phi_fv3.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90
ccpp/physics/physics/photochem/h2o_def.f
ccpp/physics/physics/photochem/module_ozphys.F90
ccpp/physics/physics/Radiation/RRTMG/radlw_param.f
ccpp/physics/physics/Radiation/RRTMG/radsw_param.f
scm/src/ccpp_config.F90
scm/src/GFS_typedefs.F90
scm/src/CCPP_typedefs.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.f
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.F90
ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90
ccpp/physics/physics/Radiation/RRTMG/radlw_main.F90
ccpp/physics/physics/Radiation/RRTMG/radsw_main.F90
ccpp/physics/physics/Radiation/RRTMG/rrtmg_lw_post.F90
ccpp/physics/physics/Radiation/RRTMG/rrtmg_lw_pre.F90
ccpp/physics/physics/Radiation/RRTMG/rrtmg_sw_post.F90
ccpp/physics/physics/Radiation/RRTMG/rad_sw_pre.F90
ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.F90
ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90
ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90
ccpp/physics/physics/GWD/cires_ugwp.F90
ccpp/physics/physics/GWD/cires_ugwp_post.F90
ccpp/physics/physics/GWD/unified_ugwp.F90
ccpp/physics/physics/GWD/unified_ugwp_post.F90
ccpp/physics/physics/GWD/ugwpv1_gsldrag.F90
ccpp/physics/physics/GWD/ugwpv1_gsldrag_post.F90
ccpp/physics/physics/GWD/drag_suite.F90
ccpp/physics/physics/GWD/gwdc_pre.f
ccpp/physics/physics/GWD/gwdc.f
ccpp/physics/physics/GWD/gwdc_post.f
ccpp/physics/physics/GWD/gwdps.f
ccpp/physics/physics/GWD/rayleigh_damp.f
ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv_pre.F90
ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv.F90
ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv_post.F90
ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.F90
ccpp/physics/physics/CONV/nTiedtke/cu_ntiedtke_pre.F90
ccpp/physics/physics/CONV/nTiedtke/cu_ntiedtke.F90
ccpp/physics/physics/CONV/nTiedtke/cu_ntiedtke_post.F90
ccpp/physics/physics/CONV/SAMF/samfdeepcnv.f
ccpp/physics/physics/CONV/SAMF/samfshalcnv.f
ccpp/physics/physics/CONV/SAS/sascnvn.F
ccpp/physics/physics/CONV/SAS/shalcnv.F
ccpp/physics/physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90
ccpp/physics/physics/CONV/Grell_Freitas/cu_gf_driver.F90
ccpp/physics/physics/CONV/Grell_Freitas/cu_gf_driver_post.F90
ccpp/physics/physics/CONV/C3/cu_c3_driver_pre.F90
ccpp/physics/physics/CONV/C3/cu_c3_driver.F90
ccpp/physics/physics/CONV/C3/cu_c3_driver_post.F90
ccpp/physics/physics/CONV/RAS/rascnv.F90
ccpp/physics/physics/PBL/SHOC/shoc.F90
ccpp/physics/physics/PBL/HEDMF/hedmf.f
ccpp/physics/physics/PBL/SHOC/moninshoc.f
ccpp/physics/physics/PBL/SATMEDMF/satmedmfvdif.F
ccpp/physics/physics/PBL/SATMEDMF/satmedmfvdifq.F
ccpp/physics/physics/PBL/saYSU/shinhongvdif.F90
ccpp/physics/physics/PBL/YSU/ysuvdif.F90
ccpp/physics/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90
ccpp/physics/physics/PBL/MYJ/myjpbl_wrapper.F90
ccpp/physics/physics/MP/GFDL/gfdl_cloud_microphys.F90
ccpp/physics/physics/MP/Zhao_Carr/zhaocarr_gscond.f
ccpp/physics/physics/MP/Zhao_Carr/zhaocarr_precpd.f
ccpp/physics/physics/MP/Morrison_Gettelmanm_micro.F90
ccpp/physics/physics/MP/Morrison_Gettelmanm_micro_pre.F90
ccpp/physics/physics/MP/Morrison_Gettelmanm_micro_post.F90
ccpp/physics/physics/MP/Thompson/mp_thompson_pre.F90
ccpp/physics/physics/MP/Thompson/mp_thompson.F90
ccpp/physics/physics/MP/Thompson/mp_thompson_post.F90
ccpp/physics/physics/MP/NSSL/mp_nssl.F90
ccpp/physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90
ccpp/physics/physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90
ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f
ccpp/physics/physics/SFC_Layer/UFS/sfc_diag_post.F90
ccpp/physics/physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90
ccpp/physics/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90
ccpp/physics/physics/SFC_Layer/UFS/sfc_diff.f
ccpp/physics/physics/SFC_Layer/UFS/sfc_nst.f
ccpp/physics/physics/SFC_Layer/UFS/sfc_nst_post.f
ccpp/physics/physics/SFC_Layer/UFS/sfc_nst_pre.f
ccpp/physics/physics/SFC_Models/Land/RUC/lsm_ruc.F90
ccpp/physics/physics/SFC_Models/Land/Noah/lsm_noah.f
ccpp/physics/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
ccpp/physics/physics/SFC_Models/Ocean/sfc_ocean.F
ccpp/physics/physics/SFC_Models/SeaIce/CICE/sfc_sice.f
ccpp/physics/physics/SFC_Models/SeaIce/CICE/sfc_cice.f
ccpp/physics/physics/SFC_Models/Lake/Flake/flake_driver.F90
ccpp/physics/physics/smoke_dust/rrfs_smoke_wrapper.F90
ccpp/physics/physics/smoke_dust/rrfs_smoke_postpbl.F90
ccpp/physics/physics/photochem/h2ophys.f
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 17 files
+135 −20 scripts/ccpp_capgen.py
+68 −8 scripts/ccpp_suite.py
+7 −3 scripts/ddt_library.py
+1 −1 scripts/fortran_tools/fortran_write.py
+4 −3 scripts/fortran_tools/parse_fortran_file.py
+2 −2 scripts/host_cap.py
+1 −1 scripts/metadata2html.py
+5 −5 scripts/metadata_parser.py
+51 −2 scripts/metadata_table.py
+39 −2 scripts/metavar.py
+333 −0 scripts/metavar_prebuild.py
+247 −2 scripts/mkcap.py
+1 −1 scripts/mkstatic.py
+2 −1 scripts/parse_tools/parse_checkers.py
+105 −81 scripts/suite_objects.py
+14 −2 src/CMakeLists.txt
+0 −6 src/ccpp_types.meta
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 256 files
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="SCM_GFS_v16" version="1">
<suite name="SCM_GFS_v16" version="1.0">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
13 changes: 13 additions & 0 deletions scm/etc/host_files.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/framework/src/ccpp_types.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/physics/physics/machine.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/physics/physics/ozne_def.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/physics/physics/h2o_def.meta
#/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/physics/physics/module_ccpp_suite_simulator.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/physics/physics/radlw_param.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/ccpp/physics/physics/radsw_param.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/scm/src/GFS_typedefs.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/scm/src/CCPP_typedefs.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/scm/src/scm_kinds.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/scm/src/scm_type_defs.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/scm/src/scm_physical_constants.meta
/glade/u/home/dswales/Projects/framework/capgen/capgen_in_SCM/ccpp-scm/scm/src/scm_utils.meta
Loading
Loading