<?xml version='1.0' encoding='utf-8' ?>
<!--
- Copyright (C) 2008-2018 EDF R&D
+ Copyright (C) 2008-2019 EDF R&D
This file is part of SALOME ADAO module
<script><code>
<![CDATA[
-import numpy, logging
+import sys, numpy, logging
logging.debug("CREATE YI Entering in CreateAssimilationStudy")
print("Entering in the assimilation study")
print("Name is set to........:", Name)
try:
# Create Assimilation study
+ if sys.version_info.major > 2: import adao
from daYacsIntegration.daStudy import *
assim_study = daStudy(Name, Algorithm, Debug)
exec("matrix="+matrix_in_string)
matrix = numpy.matrix(matrix)
else:
+ matrix_in_string=matrix_in_string.replace("'","").replace('"','')
matrix = numpy.matrix(matrix_in_string)
type = "Matrix"
logging.debug("CREATE YI Matrix is %s"%matrix)
exec("matrix="+matrix_in_string)
matrix = numpy.matrix(matrix)
else:
+ matrix_in_string=matrix_in_string.replace("'","").replace('"','')
matrix = numpy.matrix(matrix_in_string)
type = "ScalarSparseMatrix"
logging.debug("CREATE YI ScalarSparseMatrix is %s"%matrix)
exec("matrix="+matrix_in_string)
matrix = numpy.matrix(matrix)
else:
+ matrix_in_string=matrix_in_string.replace("'","").replace('"','')
matrix = numpy.matrix(matrix_in_string)
type = "DiagonalSparseMatrix"
logging.debug("CREATE YI DiagonalSparseMatrix is %s"%matrix)
exec("vector="+vector_in_string)
vector = numpy.matrix(vector)
else:
+ vector_in_string=vector_in_string.replace("'","").replace('"','')
vector = numpy.matrix(vector_in_string)
type = "Vector"
logging.debug("Vector is %s"%vector)
<inline name="SimpleUserAnalysis">
<script><code><![CDATA[
#-*- coding: utf-8 -*-
-import logging
+import sys, logging
logging.debug("TERMINATE Entering in SimpleUserAnalysis")
-ADD = Study.getResults()
+if sys.version_info.major < 3:
+ ADD = Study.getResults()
+else:
+ ADD = Study
# User code is below
]]></code></script>
</inline>
<inline name="ReadForSwitchNode">
- <script><code><![CDATA[
-import logging
+ <script><code><![CDATA[import sys, logging, codecs, pickle
+if sys.version_info.major > 2: import adao
+def loads( data ):
+ return pickle.loads(codecs.decode(data.encode(), "base64"))
logging.debug("CREATE YI Entering in ReadForSwitchNode")
-logging.debug(" with input data : "+str(data["specificParameters"]))
+# logging.debug(" with input data : ",list(data["specificParameters"]))
switch_value = -1
for param in data["specificParameters"]:
+ # logging.debug(" ReadForSwitchNode specificParameters : ",param)
if param["name"] == "switch_value":
- switch_value = int(param["value"])
+ switch_value = int(loads(param["value"]))
logging.debug(" switching to value : "+str(switch_value))
]]></code></script>
<inport name="data" type="SALOME_TYPES/ParametricInput"/>
</inline>
<inline name="ExtractDataNode">
- <script><code><![CDATA[
-import logging
-logging.debug("TERMINATE Entering in ExtractDataNode")
-try:
- import cPickle as pickle
-except:
- import pickle
+ <script><code><![CDATA[import sys, logging, codecs, pickle
+if sys.version_info.major > 2: import adao
+def loads( data ):
+ return pickle.loads(codecs.decode(data.encode(), "base64"))
+logging.debug("TERMINATE Entering in ExtractData/Node")
from daCore.AssimilationStudy import AssimilationStudy
var = None
info = None
for param in data["specificParameters"]:
if param["name"] == "var":
- var = pickle.loads(param["value"])
+ var = loads(param["value"])
if param["name"] == "info":
- info = param["value"]
+ info = loads(param["value"])
]]></code></script>
<inport name="data" type="SALOME_TYPES/ParametricInput"/>
<outport name="var" type="pyobj"/>
</inline>
<inline name="ObservationNodeFile">
- <script><code><![CDATA[execfile(script)]]></code></script>
+ <script><code><![CDATA[with open(script, 'rb') as file: exec(file.read())]]></code></script>
<inport name="var" type="pyobj"/>
<inport name="info" type="pyobj"/>
<inport name="script" type="string"/>