]> SALOME platform Git repositories - modules/adao.git/commitdiff
Salome HOME
Minor corrections
authorJean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Fri, 21 Sep 2012 13:18:48 +0000 (15:18 +0200)
committerJean-Philippe ARGAUD <jean-philippe.argaud@edf.fr>
Fri, 21 Sep 2012 13:18:48 +0000 (15:18 +0200)
src/daComposant/daAlgorithms/3DVAR.py
src/daEficas/configuration_ADAO.py

index 4178c858c30d5062a416101518d810579d6b5cd4..7d788a8c5711dd8c77f25cdc89aac35f602e8f6b 100644 (file)
@@ -166,7 +166,7 @@ class ElementaryAlgorithm(BasicObjects.Algorithm):
             self.StoredVariables["CostFunctionJb"].store( Jb )
             self.StoredVariables["CostFunctionJo"].store( Jo )
             self.StoredVariables["CostFunctionJ" ].store( J )
-            return float( J )
+            return J
         #
         def GradientOfCostFunction(x):
             _X      = numpy.asmatrix(x).flatten().T
index dc1793ba15f358497ffc80a7df0a06977d6b5645..fe8e30f7d157a0fec1085903feb149d9b28b1bf3 100644 (file)
@@ -44,6 +44,7 @@ class CONFIG(configuration.CONFIG_BASE):
     self.rep_user = os.environ["HOME"]
     self.appli   = appli
     self.code    = appli.code
+    # self.lang    = "fr"
     self.rep_ini = repIni
     self.rep_mat=" " # Compatbilite Aster
     self.savedir      = self.rep_user