- resources DATASSIM -> ADAO

diff --git a/resources/ADAOCatalog.xml b/resources/ADAOCatalog.xml
new file mode 100644 (file)
index 0000000..d133614
--- /dev/null
+++ b/resources/ADAOCatalog.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='us-ascii' ?>
+
+<!-- XML component catalog -->
+<begin-catalog>
+
+<!-- Path prefix information -->
+
+<path-prefix-list>
+</path-prefix-list>
+
+<!-- Commonly used types  -->
+<type-list>
+  <objref name="pyobj" id="python:obj:1.0"/>
+  <objref name="file" id="file"/>
+</type-list>
+
+<!-- Component list -->
+<component-list>
+
+</component-list>
+</begin-catalog>

diff --git a/resources/ADAOSchemaCatalog.xml b/resources/ADAOSchemaCatalog.xml
new file mode 100644 (file)
index 0000000..44f5fc5
--- /dev/null
+++ b/resources/ADAOSchemaCatalog.xml
@@ -0,0 +1,133 @@
+<?xml version='1.0' encoding='iso-8859-1' ?>
+<proc>
+  
+  <objref name="computeAD" id="python:computeAD:1.0">
+    <base>pyobj</base>
+  </objref>
+
+  <inline name="CreateAssimilationStudy">
+    <script><code>
+
+<![CDATA[
+import numpy
+print "Entering in CreateAssimilationStudy"
+print "Name is", Name
+print "Algorithm is", Algorithm
+
+# Create Assimilation study
+from daYacsIntegration.daStudy import *
+assim_study = daStudy(Name, Algorithm)
+
+# Data
+print "Data entered are:"
+# Background
+try:
+  Background
+except NameError:
+  pass
+else:
+  print "Background is", Background
+  print "BackgroundType is", BackgroundType
+  assim_study.setBackgroundType(BackgroundType)
+  assim_study.setBackground(Background)
+
+# BackgroundError
+try:
+  BackgroundError
+except NameError:
+  pass
+else:
+  print "BackgroundError is", BackgroundError
+  print "BackgroundErrorType is", BackgroundErrorType
+  assim_study.setBackgroundError(BackgroundError)
+
+# Observation
+try:
+  Observation
+except NameError:
+  pass
+else:
+  print "Observation is", Observation
+  print "ObservationType is", ObservationType
+  assim_study.setObservationType(ObservationType)
+  assim_study.setObservation(Observation)
+
+# ObservationError
+try:
+  ObservationError
+except NameError:
+  pass
+else:
+  print "ObservationError is", ObservationError
+  print "ObservationErrorType is", ObservationErrorType
+  assim_study.setObservationError(ObservationError)
+
+# ObservationOperator
+try:
+  ObservationOperator
+except NameError:
+  pass
+else:
+  print "ObservationOperator is", ObservationOperator
+  print "ObservationOperatorType is", ObservationOperatorType
+  assim_study.setObservationOperatorType(ObservationOperatorType)
+  assim_study.setObservationOperator(ObservationOperator)
+
+Study = assim_study
+]]>
+
+</code></script>
+    <inport name="Name" type="string"/>
+    <inport name="Algorithm" type="string"/>
+    <outport name="Study" type="pyobj"/>
+  </inline>
+
+  <inline name="CreateNumpyMatrixFromString">
+    <script><code><![CDATA[
+print "Entering in CreateNumpyMatrixFromString"
+import numpy
+matrix = numpy.matrix(matrix_in_string)
+type = "Matrix"
+print "Matrix is", matrix
+]]></code></script>
+    <inport name="matrix_in_string" type="string"/>
+    <outport name="matrix" type="pyobj"/>
+    <outport name="type" type="string"/>
+  </inline>
+
+  <inline name="CreateNumpyVectorFromString">
+    <script><code><![CDATA[
+print "Entering in CreateNumpyVectorFromString"
+import numpy
+vector = numpy.matrix(vector_in_string)
+type = "Vector"
+print "Vector is", vector
+]]></code></script>
+    <inport name="vector_in_string" type="string"/>
+    <outport name="vector" type="pyobj"/>
+    <outport name="type" type="string"/>
+  </inline>
+
+  <inline name="SimpleExecuteDirectAlgorithm">
+    <script><code><![CDATA[
+print "Entering in SimpleExecuteDirectAlgorithm"
+from daYacsIntegration.daStudy import *
+ADD = Study.getAssimilationStudy()
+ADD.analyze()
+]]></code></script>
+    <inport name="Study" type="pyobj"/>
+    <outport name="Study" type="pyobj"/>
+  </inline>
+
+  <inline name="SimpleUserAnalysis">
+    <script><code><![CDATA[
+#-*-coding:iso-8859-1-*-
+print "Entering in SimpleUserAnalysis"
+from daYacsIntegration.daStudy import *
+ADD = Study.getAssimilationStudy()
+# User code is below
+
+]]></code></script>
+    <inport name="Study" type="pyobj"/>
+  </inline>
+</proc>

diff --git a/resources/DATASSIMCatalog.xml b/resources/DATASSIMCatalog.xml
deleted file mode 100644 (file)
index d133614..0000000
--- a/resources/DATASSIMCatalog.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='us-ascii' ?>
-
-<!-- XML component catalog -->
-<begin-catalog>
-
-<!-- Path prefix information -->
-
-<path-prefix-list>
-</path-prefix-list>
-
-<!-- Commonly used types  -->
-<type-list>
-  <objref name="pyobj" id="python:obj:1.0"/>
-  <objref name="file" id="file"/>
-</type-list>
-
-<!-- Component list -->
-<component-list>
-
-</component-list>
-</begin-catalog>

diff --git a/resources/DATASSIMSchemaCatalog.xml b/resources/DATASSIMSchemaCatalog.xml
deleted file mode 100644 (file)
index 44f5fc5..0000000
--- a/resources/DATASSIMSchemaCatalog.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version='1.0' encoding='iso-8859-1' ?>
-<proc>
-  
-  <objref name="computeAD" id="python:computeAD:1.0">
-    <base>pyobj</base>
-  </objref>
-
-  <inline name="CreateAssimilationStudy">
-    <script><code>
-
-<![CDATA[
-import numpy
-print "Entering in CreateAssimilationStudy"
-print "Name is", Name
-print "Algorithm is", Algorithm
-
-# Create Assimilation study
-from daYacsIntegration.daStudy import *
-assim_study = daStudy(Name, Algorithm)
-
-# Data
-print "Data entered are:"
-# Background
-try:
-  Background
-except NameError:
-  pass
-else:
-  print "Background is", Background
-  print "BackgroundType is", BackgroundType
-  assim_study.setBackgroundType(BackgroundType)
-  assim_study.setBackground(Background)
-
-# BackgroundError
-try:
-  BackgroundError
-except NameError:
-  pass
-else:
-  print "BackgroundError is", BackgroundError
-  print "BackgroundErrorType is", BackgroundErrorType
-  assim_study.setBackgroundError(BackgroundError)
-
-# Observation
-try:
-  Observation
-except NameError:
-  pass
-else:
-  print "Observation is", Observation
-  print "ObservationType is", ObservationType
-  assim_study.setObservationType(ObservationType)
-  assim_study.setObservation(Observation)
-
-# ObservationError
-try:
-  ObservationError
-except NameError:
-  pass
-else:
-  print "ObservationError is", ObservationError
-  print "ObservationErrorType is", ObservationErrorType
-  assim_study.setObservationError(ObservationError)
-
-# ObservationOperator
-try:
-  ObservationOperator
-except NameError:
-  pass
-else:
-  print "ObservationOperator is", ObservationOperator
-  print "ObservationOperatorType is", ObservationOperatorType
-  assim_study.setObservationOperatorType(ObservationOperatorType)
-  assim_study.setObservationOperator(ObservationOperator)
-
-Study = assim_study
-]]>
-
-</code></script>
-    <inport name="Name" type="string"/>
-    <inport name="Algorithm" type="string"/>
-    <outport name="Study" type="pyobj"/>
-  </inline>
-
-  <inline name="CreateNumpyMatrixFromString">
-    <script><code><![CDATA[
-print "Entering in CreateNumpyMatrixFromString"
-import numpy
-matrix = numpy.matrix(matrix_in_string)
-type = "Matrix"
-print "Matrix is", matrix
-]]></code></script>
-    <inport name="matrix_in_string" type="string"/>
-    <outport name="matrix" type="pyobj"/>
-    <outport name="type" type="string"/>
-  </inline>
-
-  <inline name="CreateNumpyVectorFromString">
-    <script><code><![CDATA[
-print "Entering in CreateNumpyVectorFromString"
-import numpy
-vector = numpy.matrix(vector_in_string)
-type = "Vector"
-print "Vector is", vector
-]]></code></script>
-    <inport name="vector_in_string" type="string"/>
-    <outport name="vector" type="pyobj"/>
-    <outport name="type" type="string"/>
-  </inline>
-
-  <inline name="SimpleExecuteDirectAlgorithm">
-    <script><code><![CDATA[
-print "Entering in SimpleExecuteDirectAlgorithm"
-from daYacsIntegration.daStudy import *
-ADD = Study.getAssimilationStudy()
-ADD.analyze()
-]]></code></script>
-    <inport name="Study" type="pyobj"/>
-    <outport name="Study" type="pyobj"/>
-  </inline>
-
-  <inline name="SimpleUserAnalysis">
-    <script><code><![CDATA[
-#-*-coding:iso-8859-1-*-
-print "Entering in SimpleUserAnalysis"
-from daYacsIntegration.daStudy import *
-ADD = Study.getAssimilationStudy()
-# User code is below
-
-]]></code></script>
-    <inport name="Study" type="pyobj"/>
-  </inline>
-</proc>

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 1dd593d6fb4ddc8d53f9d9f00f6c9642386dce08..727fdfb6b5c69499b26350a179bf172b3fdb7e0c 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,7 +1,7 @@
 
 include $(top_srcdir)/adm_local/make_common_starter.am
 
-DATA_INST = DATASSIMCatalog.xml DATASSIMSchemaCatalog.xml SalomeApp.xml
+DATA_INST = ADAOCatalog.xml ADAOSchemaCatalog.xml SalomeApp.xml
 
 salomeres_DATA = ${DATA_INST}
 EXTRA_DIST = ${DATA_INST}

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index fc882c150927e33c145c2ef661eee4a402a5e24f..2414273c580df5bec9245086b8942b5f59c1a6e4 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -1,11 +1,11 @@
 <document>
-  <section name="DATASSIM">
+  <section name="ADAO">
     <!-- Major module parameters -->
-    <parameter name="name"    value="DATASSIM"/>
+    <parameter name="name"    value="ADAO"/>
     <parameter name="library" value="SalomePyQtGUI"/>
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="DATASSIM" value="${DATASSIM_ROOT_DIR}/share/salome/resources/datassim"/>
+    <parameter name="ADAO" value="${ADAO_ROOT_DIR}/share/salome/resources/adao"/>
   </section>
 </document>