From 6237d131b18ece6768e1a2d01acadf53401cfc42 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Wed, 2 Feb 2022 21:02:24 -0700 Subject: [PATCH] Updates and bug fixes to complete ccpp_prebuild.py call --- ufs/ccpp/config/ccpp_prebuild_config.py | 5 +++-- ufs/ccpp/data/GFS_typedefs.F90 | 4 ++++ ufs/ccpp/data/GFS_typedefs.meta | 2 +- ufs/ccpp/data/med_typedefs.F90 | 8 +++++++- ufs/ccpp/data/med_typedefs.meta | 19 +++++++++---------- ufs/ccpp/suites/suite_FV3_sfc_ocean.xml | 9 +++++++++ 6 files changed, 33 insertions(+), 14 deletions(-) mode change 100644 => 100755 ufs/ccpp/config/ccpp_prebuild_config.py create mode 100644 ufs/ccpp/suites/suite_FV3_sfc_ocean.xml diff --git a/ufs/ccpp/config/ccpp_prebuild_config.py b/ufs/ccpp/config/ccpp_prebuild_config.py old mode 100644 new mode 100755 index e2b4ec675..a70bf7f73 --- a/ufs/ccpp/config/ccpp_prebuild_config.py +++ b/ufs/ccpp/config/ccpp_prebuild_config.py @@ -195,11 +195,12 @@ CAPS_DIR = '{build_dir}/physics' # Directory where the suite definition files are stored -SUITES_DIR = '{}/ccpp/suites'.format(fv3_path) +SUITES_DIR = 'CMEPS/ufs/ccpp/suites' # Directory where to write static API to STATIC_API_DIR = '{build_dir}/physics' -STATIC_API_SRCFILE = '{build_dir}/physics/CCPP_STATIC_API.sh' +STATIC_API_CMAKEFILE = '{build_dir}/physics/CCPP_STATIC_API.cmake' +STATIC_API_SOURCEFILE = '{build_dir}/physics/CCPP_STATIC_API.sh' # Directory for writing HTML pages generated from metadata files METADATA_HTML_OUTPUT_DIR = '{build_dir}/physics/physics/docs' diff --git a/ufs/ccpp/data/GFS_typedefs.F90 b/ufs/ccpp/data/GFS_typedefs.F90 index a0d302a29..077a09bc1 100644 --- a/ufs/ccpp/data/GFS_typedefs.F90 +++ b/ufs/ccpp/data/GFS_typedefs.F90 @@ -1,4 +1,8 @@ module GFS_typedefs + +!> \section arg_table_GFS_typedefs +!! \htmlinclude GFS_typedefs.html +!! use machine, only: kind_phys use physcons, only: con_hvap, con_cp, con_rd, con_eps use physcons, only: con_epsm1, con_fvirt diff --git a/ufs/ccpp/data/GFS_typedefs.meta b/ufs/ccpp/data/GFS_typedefs.meta index 3ff2d4fc7..b77c0085e 100644 --- a/ufs/ccpp/data/GFS_typedefs.meta +++ b/ufs/ccpp/data/GFS_typedefs.meta @@ -241,7 +241,7 @@ [ccpp-table-properties] name = GFS_typedefs type = module - relative_path = ../FV3/ccpp/physics/physics + relative_path = ../../../../../FV3/ccpp/physics/physics dependencies = machine.F,physcons.F90 [ccpp-arg-table] diff --git a/ufs/ccpp/data/med_typedefs.F90 b/ufs/ccpp/data/med_typedefs.F90 index e4481d797..985626e60 100644 --- a/ufs/ccpp/data/med_typedefs.F90 +++ b/ufs/ccpp/data/med_typedefs.F90 @@ -3,16 +3,22 @@ module med_type_defs +!> \section arg_table_med_type_defs +!! \htmlinclude med_type_defs.html +!! + use GFS_typedefs, only: GFS_statein_type use GFS_typedefs, only: GFS_init_type use GFS_typedefs, only: GFS_interstitial_type use GFS_typedefs, only: GFS_control_type use GFS_typedefs, only: GFS_coupling_type - use machine, only: kind_phys use ccpp_api, only: ccpp_t implicit none +!! \section arg_table_physics_type +!! \htmlinclude physics_type.html +!! type physics_type type(GFS_init_type) :: init type(GFS_statein_type) :: statein diff --git a/ufs/ccpp/data/med_typedefs.meta b/ufs/ccpp/data/med_typedefs.meta index 5afaccd76..28ff74f57 100644 --- a/ufs/ccpp/data/med_typedefs.meta +++ b/ufs/ccpp/data/med_typedefs.meta @@ -19,34 +19,33 @@ dimensions = () type = GFS_statein_type [Interstitial] - standard_name = GFS_interstitial_type - long_name = definition of type GFS_interstitial_type + standard_name = GFS_interstitial_type_instance + long_name = instance of derived type GFS_interstitial_type units = DDT dimensions = () type = GFS_interstitial_type [Model] - standard_name = GFS_control_type - long_name = definition of type GFS_control_type + standard_name = GFS_control_type_instance + long_name = instance of derived type GFS_control_type units = DDT dimensions = () type = GFS_control_type [Coupling] - standard_name = GFS_coupling_type - long_name = definition of type GFS_coupling_type + standard_name = GFS_coupling_type_instance + long_name = instance of derived type GFS_coupling_type units = DDT dimensions = () type = GFS_coupling_type ######################################################################## [ccpp-table-properties] - name = med_typedefs + name = med_type_defs type = module dependencies = GFS_typedefs.F90 - dependencies = ../FV3/ccpp/physics/physics/machine.F - dependencies = ../FV3/ccpp/framework/src/ccpp_api.F90 + dependencies = ../../../../../FV3/ccpp/framework/src/ccpp_api.F90 [ccpp-arg-table] - name = med_typedefs + name = med_type_defs type = module [physics_type] standard_name = physics_type diff --git a/ufs/ccpp/suites/suite_FV3_sfc_ocean.xml b/ufs/ccpp/suites/suite_FV3_sfc_ocean.xml new file mode 100644 index 000000000..2d93d4242 --- /dev/null +++ b/ufs/ccpp/suites/suite_FV3_sfc_ocean.xml @@ -0,0 +1,9 @@ + + + + + + sfc_ocean + + +