Skip to content

Commit

Permalink
Merge pull request NCAR#197 from grantfirl/GFS_DDT_removal
Browse files Browse the repository at this point in the history 
SCM changes for GFS DDT removal from physics
  • Loading branch information
@grantfirl
grantfirl committed Oct 13, 2020
2 parents acd65c5 + 70916b5 commit 2d9d884
Show file tree
Hide file tree
Showing 29 changed files with 1,443 additions and 1,192 deletions.
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 3 files
+0 −0 .gitmodules
+1 −0 scripts/ccpp_prebuild.py
+1 −2 scripts/metadata_parser.py
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 148 files
29 changes: 9 additions & 20 deletions ccpp/suites/suite.xsd
View file
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_SCM_GFS_v15p2.xml
View file
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_v15p2" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml
View file
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_v15p2_ACM_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_ACM_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_FA.xml
View file
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_v15p2_FA" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_FA" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml
View file
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_v15p2_MYJ" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_MYJ" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
View file
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_v15p2_RRTMGP" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_RRTMGP" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
View file
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_v15p2_RRTMGP_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_RRTMGP_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml
View file
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_v15p2_YSU_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_YSU_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml
View file
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_v15p2_no_nsst" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_no_nsst" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml
View file
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_v15p2_no_nsst_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_no_nsst_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml
View file
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_v15p2_noahmp" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_noahmp" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_ps.xml
View file
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_v15p2_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml
View file
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_v15p2_saYSU_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v15p2_saYSU_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta.xml
View file
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_v16beta" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v16beta" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_RRTMGP.xml
View file
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_v16beta_RRTMGP" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v16beta_RRTMGP" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_RRTMGP_ps.xml
View file
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_v16beta_RRTMGP_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v16beta_RRTMGP_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_no_nsst.xml
View file
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_v16beta_no_nsst" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v16beta_no_nsst" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_no_nsst_ps.xml
View file
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_v16beta_no_nsst_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v16beta_no_nsst_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GFS_v16beta_ps.xml
View file
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_v16beta_ps" lib="ccppphys" ver="4">
<suite name="SCM_GFS_v16beta_ps" version="1">
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
Expand Down
2 changes: 1 addition & 1 deletion ccpp/suites/suite_SCM_GSD_v1.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

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

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

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

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

0 comments on commit 2d9d884

Please sign in to comment.