From 49bcbc3f1bc0091f09dc4b7a321bf1fdbd064067 Mon Sep 17 00:00:00 2001
From: Eric Fayolle <eric.fayolle@edf.fr>
Date: Mon, 14 May 2018 12:44:44 +0200
Subject: [PATCH] Ajout d'un test significatif pour l'utilisation des blocs en
 eficas

---
 Atmo/cata_modele_subst.xml | 39 +++++++++++++++++++++++++
 Atmo/modele_subst.xsd      | 59 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)
 create mode 100755 Atmo/cata_modele_subst.xml
 create mode 100755 Atmo/modele_subst.xsd

diff --git a/Atmo/cata_modele_subst.xml b/Atmo/cata_modele_subst.xml
new file mode 100755
index 00000000..bdca1a91
--- /dev/null
+++ b/Atmo/cata_modele_subst.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Sample XML file generated by XMLSpy v2015 rel. 4 (http://www.altova.com)-->
+<cata efficas:nom="Atmo" xmlns="http://chercheurs.edf.com/logiciels/efficas" xmlns:efficas="http://chercheurs.edf.com/logiciels/efficas" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://chercheurs.edf.com/logiciels/efficas ../Efi2Xsd/ModeleEficas/Model%20Efficas%20(1.1)%20%20v9.xsd">
+<commandes>
+
+<PROC efficas:nom="Atmos">
+<doc efficas:fr="Définition d'un cas d'étude atmosphérique" efficas:ang="Definition of study case"></doc>
+		<FACT efficas:nom="Wind">
+			<SIMP efficas:nom="Wind_Speed">
+				<nomTypeAttendu>I</nomTypeAttendu>
+			</SIMP>
+			<FACT efficas:nom="Mesure" efficas:minOccurences="1" efficas:maxOccurences="4">
+				<SIMP efficas:nom="Value">
+					<nomTypeAttendu>I</nomTypeAttendu>
+				</SIMP>
+				<SIMP efficas:nom="Unit">
+				    <plageValeur><into><TXM>feet</TXM></into><into><TXM>meters</TXM></into></plageValeur>
+					<nomTypeAttendu>TXM</nomTypeAttendu>
+				</SIMP>
+			</FACT>
+			<BLOC efficas:nom="Bloc_enter_mesure">
+				<SIMP efficas:nom="Bloc_Wind_Speed">
+					<nomTypeAttendu>I</nomTypeAttendu>
+				</SIMP>
+				<FACT efficas:nom="Bloc_Mesure" efficas:minOccurences="1" efficas:maxOccurences="4">
+					<SIMP efficas:nom="Bloc_Value">
+						<nomTypeAttendu>I</nomTypeAttendu>
+					</SIMP>
+					<SIMP efficas:nom="Bloc_Unit">
+						<plageValeur><into><TXM>feet</TXM></into><into><TXM>meters</TXM></into></plageValeur>
+						<nomTypeAttendu>TXM</nomTypeAttendu>
+					</SIMP>
+				</FACT>
+				<condition>Wind_Speed == 1</condition>
+			</BLOC>
+		</FACT>
+</PROC>
+</commandes>
+</cata>
diff --git a/Atmo/modele_subst.xsd b/Atmo/modele_subst.xsd
new file mode 100755
index 00000000..b5955aac
--- /dev/null
+++ b/Atmo/modele_subst.xsd
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- edited with XMLSpy v2015 rel. 4 (http://www.altova.com) by USER1 (EDF-DSP) -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:atmos="http://chercheurs.edf.com/logiciels/atmos" targetNamespace="http://chercheurs.edf.com/logiciels/atmos" elementFormDefault="qualified" attributeFormDefault="qualified">
+	<simpleType name="T_Wind_Speed">
+		<restriction base="int"/>
+	</simpleType>
+	<simpleType name="T_Speed_Unit">
+		<restriction base="string"/>
+	</simpleType>
+	<simpleType name="T_Bloc_Wind_Speed">
+		<restriction base="int"/>
+	</simpleType>
+	<simpleType name="T_Bloc_Speed_Unit">
+		<restriction base="string"/>
+	</simpleType>
+	<simpleType name="T_Value">
+		<restriction base="int"/>
+	</simpleType>
+	<simpleType name="T_Unit">
+		<restriction base="string"/>
+	</simpleType>
+	<simpleType name="T_Bloc_Value">
+		<restriction base="int"/>
+	</simpleType>
+	<simpleType name="T_Bloc_Unit">
+		<restriction base="string"/>
+	</simpleType>
+	<complexType name="T_Atmos">
+		<sequence>
+			<element name="Wind" type="atmos:T_Wind" minOccurs="1" maxOccurs="1"/>
+		</sequence>
+	</complexType>
+	<complexType name="T_Mesure">
+		<sequence maxOccurs="4">
+			<element name="Value" type="atmos:T_Value"/>
+			<element name="Unit" type="atmos:T_Unit"/>
+		</sequence>
+	</complexType>
+	<complexType name="T_Bloc_Mesure">
+		<sequence maxOccurs="4">
+			<element name="Bloc_Value" type="atmos:T_Bloc_Value"/>
+			<element name="Bloc_Unit" type="atmos:T_Bloc_Unit"/>
+		</sequence>
+	</complexType>
+	<complexType name="T_Wind">
+		<sequence>
+			<element name="Wind_Speed" type="atmos:T_Wind_Speed"/>
+			<element name="Mesure" type="atmos:T_Mesure"/>
+			<group ref="atmos:T_Bloc_enter_mesure" minOccurs="0"/>
+		</sequence>
+	</complexType>
+	<element name="Atmos" type="atmos:T_Atmos"/>
+	<group name="T_Bloc_enter_mesure">
+		<sequence>
+			<element name="Bloc_Wind_Speed" type="atmos:T_Bloc_Wind_Speed"/>
+			<element name="Bloc_Mesure" type="atmos:T_Bloc_Mesure" minOccurs="0"/>
+		</sequence>
+	</group>
+</schema>
-- 
2.39.2