Skip to content

Commit

Permalink
Merge NCAR feature/transition-to-capgen-1 (prepare for cap_gen.py, st…
Browse files Browse the repository at this point in the history
…ep 1) to develop (#186)

- update the syntax in the XML suite definition files, replace `lib="ccppphys" ver="N"` with `version=1` which indicates the suite definition file format version (i.e. the XML schema version) rather than the release version of ccpp-physics ; update the XML schema for the CCPP suite definition files (`suite.xsd`)
- add variables in `GFS_typedefs.{f90,meta}` that are require to support the removal of the GFS DDT dependency in the radiation physics (mainly additional indices; see NCAR/ccpp-physics#508)
  • Loading branch information
climbfuji committed Oct 9, 2020
1 parent 2fa7a44 commit 90bc1a4
Show file tree
Hide file tree
Showing 60 changed files with 1,345 additions and 1,047 deletions.
2 changes: 1 addition & 1 deletion ccpp/framework
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 138 files
29 changes: 9 additions & 20 deletions ccpp/suites/suite.xsd
Original file line number Diff line number Diff line change
@@ -1,48 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<xs:schema elementFormDefault="qualified"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
targetNamespace="https://dtcenter.org/gmtb/users/ccpp/2018/04/23"
xmlns:namens="https://dtcenter.org/gmtb/users/ccpp/2018/04/23">
xmlns:xs="http://www.w3.org/2001/XMLSchema">

<!-- definition of function pointer type -->
<xs:complexType name="functionPointer">
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="lib" type="xs:string" use="optional"/>
<xs:attribute name="ver" type="xs:string" use="optional"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>

<!-- definition of complex elements -->
<!-- definition of complex element subcycle -->
<xs:element name="subcycle">
<xs:complexType>
<xs:sequence>
<xs:element name="scheme" type="functionPointer" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="scheme" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="loop" type="xs:positiveInteger" use="optional"/>
</xs:complexType>
</xs:element>

<!-- definition of complex element group -->
<xs:element name="group">
<xs:complexType>
<xs:choice>
<xs:element ref="subcycle" minOccurs="1" maxOccurs="unbounded"/>
</xs:choice>
<xs:attribute name="part" type="xs:positiveInteger" use="optional"/>
<xs:attribute name="name" type="xs:string"/>
</xs:complexType>
</xs:element>

<!-- definition of complex element suite -->
<xs:element name="suite">
<xs:complexType>
<xs:sequence>
<xs:element name="init" type="functionPointer" minOccurs="0" maxOccurs="1"/>
<xs:element name="init" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element ref="group" minOccurs="1" maxOccurs="unbounded"/>
<xs:element name="finalize" type="functionPointer" minOccurs="0" maxOccurs="1"/>
<xs:element name="finalize" type="xs:string" minOccurs="0" maxOccurs="1"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string"/>
<xs:attribute name="lib" type="xs:string" use="optional"/>
<xs:attribute name="ver" type="xs:string" use="optional"/>
<xs:attribute name="version" type="xs:positiveInteger" use="optional"/>
</xs:complexType>
</xs:element>

Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_CPT_v0.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_CPT_v0" lib="ccppphys" ver="4">
<suite name="FV3_CPT_v0" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_coupled.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_coupled" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_coupled" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_couplednsst.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_couplednsst" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_couplednsst" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_csawmg.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_csawmg" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_csawmg" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_csawmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_csawmgshoc" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_csawmgshoc" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_fv3wam.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_fv3wam" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_fv3wam" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_gfdlmp" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_noahmp.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp_noahmp" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_gfdlmp_noahmp" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp_regional" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_gfdlmp_regional" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_gfdlmp_regional_c768" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_gfdlmp_regional_c768" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_h2ophys.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_h2ophys" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_h2ophys" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_myj.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_myj" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_myj" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ntiedtke.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_ntiedtke" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_ntiedtke" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ozphys_2015.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_ozphys_2015" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_ozphys_2015" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_sas.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_sas" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_sas" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_satmedmf" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_satmedmf" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmf_coupled.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_satmedmf_coupled" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_satmedmf_coupled" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_satmedmfq.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_satmedmfq" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_satmedmfq" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_shinhong.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_shinhong" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_shinhong" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_stretched.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_stretched" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_stretched" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_2017_ysu.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_2017_ysu" lib="ccppphys" ver="4">
<suite name="FV3_GFS_2017_ysu" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_cpld_rasmgshoc" lib="ccppphys" ver="4">
<suite name="FV3_GFS_cpld_rasmgshoc" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_cpld_rasmgshocnsst" lib="ccppphys" ver="4">
<suite name="FV3_GFS_cpld_rasmgshocnsst" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_cpldnst_rasmgshoc" lib="ccppphys" ver="4">
<suite name="FV3_GFS_cpldnst_rasmgshoc" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_rasmgshoc" lib="ccppphys" ver="4">
<suite name="FV3_GFS_rasmgshoc" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_gf.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_gf" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_gf" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_gf_thompson.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_gf_thompson" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_gf_thompson" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_mynn.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_mynn" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_mynn" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_ras.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_ras" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_ras" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_rasmgshoc" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_rasmgshoc" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_thompson.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_thompson" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_thompson" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15_thompson_mynn.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15_thompson_mynn" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15_thompson_mynn" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15p2.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15p2" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15p2" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15p2_RRTMGP.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15p2_RRTMGP" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15p2_RRTMGP" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15p2_coupled.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15p2_coupled" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15p2_coupled" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15p2_no_nsst.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15p2_no_nsst" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15p2_no_nsst" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15plus.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15plus" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15plus" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v15plusras.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v15plusras" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v15plusras" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v16_csawmg" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v16_csawmg" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_GFS_v16beta.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v16beta" lib="ccppphys" ver="4">
<suite name="FV3_GFS_v16beta" version="1">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down
Loading

0 comments on commit 90bc1a4

Please sign in to comment.