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

Add Support for Email Options #1719

Merged
merged 17 commits into from
Jul 14, 2017
Merged

Add Support for Email Options #1719

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
4f94044
Added mail options to case.submit.
Jun 6, 2017
c36bc48
Added email options for batch systems
Jun 21, 2017
c824805
Fixed typo
Jun 22, 2017
56b91ef
Testing a environ check bipass
Jun 23, 2017
7989df3
Adding handling of non-existent $ENV{EMAIL}
Jun 23, 2017
d0cf34f
Fixed a simple typo
Jun 23, 2017
9fce892
Fixed call to wrong function
Jun 26, 2017
3a10387
Moved flags and options to XML
Jul 7, 2017
04016e5
Fixed typo in XML
Jul 7, 2017
aac6ad1
Fixed another typo in XML
Jul 7, 2017
4eac8a0
Last set of XML typos?
Jul 7, 2017
f886a07
Added mail elements to XML schema
Jul 7, 2017
882e9b1
Element definitions in wrong place
Jul 7, 2017
9469592
Made elements a minOccurs element
Jul 7, 2017
fe21e13
Forgot the simple element
Jul 7, 2017
5e2424d
Another typo in env_batch.py
Jul 7, 2017
bb19ad6
Email feature appears to work
Jul 13, 2017
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
317 changes: 186 additions & 131 deletions config/acme/machines/config_batch.xml
View file
Open in desktop

Large diffs are not rendered by default.

52 changes: 26 additions & 26 deletions config/acme/machines/config_batch.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
<xs:complexType>
<xs:sequence>

<!-- definition of batch_system complex elements -->
<xs:element name="batch_system" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>
<!-- definition of batch_system complex elements -->
<xs:element name="batch_system" maxOccurs="unbounded">
<xs:complexType>
<xs:sequence>

<xs:element name="batch_query" minOccurs="1" maxOccurs="1">
<xs:element name="batch_query" minOccurs="1" maxOccurs="1">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
Expand All @@ -22,33 +22,33 @@
</xs:complexType>
</xs:element>

<xs:element name="batch_submit" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="batch_redirect" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="batch_directive" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="batch_submit" type="xs:string" minOccurs="1" maxOccurs="1"/>
<xs:element name="batch_redirect" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="batch_directive" type="xs:string" minOccurs="0" maxOccurs="1"/>

<xs:element name="directives" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="directives" minOccurs="0" maxOccurs="1">
<xs:complexType>
<xs:sequence>

<xs:element name="directive" minOccurs="0" maxOccurs="unbounded">
<xs:element name="directive" minOccurs="0" maxOccurs="unbounded">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="default" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="default" type="xs:string"/>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:element>

</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>

</xs:sequence>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="version" type="xs:string" use="required"/>
</xs:complexType>
</xs:sequence>
<xs:attribute name="type" type="xs:string" use="required"/>
<xs:attribute name="version" type="xs:string" use="required"/>
</xs:complexType>
</xs:element>

</xs:sequence>
Expand Down
1 change: 0 additions & 1 deletion config/acme/machines/template.case.run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ OR
parser.add_argument("--caseroot",
help="Case directory to build")


parser.add_argument("--skip-preview-namelist", action="store_true",
help="Skip calling preview-namelist during case.run")

Expand Down
Loading