Merge branch 'onera:main' into main

onera · Jul 29, 2024 · a4b76ef · a4b76ef
2 parents b5478b3 + 4111ed4
commit a4b76ef
Show file tree

Hide file tree

Showing 139 changed files with 1,296 additions and 3,572 deletions.
diff --git a/Cassiopee/Apps/Apps/Fast/Fast2Kim.py b/Cassiopee/Apps/Apps/Fast/Fast2Kim.py
@@ -443,12 +443,10 @@ def createKimAero(self):
                         self.write_fortran_block(fich, z[2][0][1].reshape(z[2][0][1].shape[0]*z[2][0][1].shape[1]), DOUBLE_SIZE) #Z
                         self.write_fortran_block(fich, pressure[2][0][1].reshape(pressure[2][0][1].shape[0]*pressure[2][0][1].shape[1]), DOUBLE_SIZE) #P
                         fich.close()
-                    #itglob += 1
                     else:
                         C.convertPyTree2File(cz, kimAeroFile, 'fmt_tp')
                         #C.convertPyTree2File(cz,'out%d.cgns'%itglob )
                     #checkZones.append(cz)
-
                     itglob += 1
 
             # Container courant
@@ -457,8 +455,6 @@ def createKimAero(self):
             paths += ['CGNSTree/Base/%s/FlowSolution'%(zone[0])]
             print(paths)
             nodes2 = Distributed.readNodesFromPaths(self.config['filename'], paths)
-            #print(nodes2)
-            #exit()
             px = Internal.getNodeFromName(nodes2[0], 'CoordinateX')[1]
             time = Internal.getNodeFromName(nodes2[2], 'time')[1]
             nrec = px.shape[0]-1 # 50
@@ -495,9 +491,8 @@ def createKimAero(self):
                         self.write_fortran_block(fich, z[2][0][1].reshape(z[2][0][1].shape[0]*z[2][0][1].shape[1]), DOUBLE_SIZE) #Z
                         self.write_fortran_block(fich, pressure[2][0][1].reshape(pressure[2][0][1].shape[0]*pressure[2][0][1].shape[1]), DOUBLE_SIZE) #P
                         fich.close()
-                            #itglob += 1
                     else:
-                        C.convertPyTree2File(cz, kimAeroFile, 'fmt_tp')      
+                        C.convertPyTree2File(cz, kimAeroFile, 'fmt_tp')
                     itglob += 1
 
         #Internal.printTree(checkZones)

diff --git a/Cassiopee/Apps/doc/Apps.txt b/Cassiopee/Apps/doc/Apps.txt
@@ -1,25 +1,4 @@
 ===============================================================================
-Apps 3.7 [10/2023]
-Require: C++ compiler, python > 2.7, numpy > 1.0, All modules 3.7
-===============================================================================
-Apps 3.6 [03/2023]
-Require: C++ compiler, python > 2.4, numpy > 1.0, All modules 3.6
-===============================================================================
-Apps 3.5 [12/2022]
-Require: C++ compiler, python > 2.4, numpy > 1.0, All modules 3.5
-===============================================================================
-Apps 3.4 [07/2022]
-Require: C++ compiler, python > 2.4, numpy > 1.0, All modules 3.4
-===============================================================================
-Apps 3.3 [10/2021]
-Require: C++ compiler, python > 2.4, numpy > 1.0, All modules 3.3
-===============================================================================
-Apps 3.2 [02/2021]
-Require: C++ compiler, python > 2.4, numpy > 1.0, All modules 3.2
-===============================================================================
-Apps 3.1 [06/2020]
-Require: C++ compiler, python > 2.4, numpy > 1.0, All modules 3.1
-- Apps.IBM : extractIBMWallFields and loads for a family of zones.
-- Apps.ToolboxCODA: IBM toolbox for CODA solver (non opensource)
-- Apps.Mesh : structured Cartesian (octree) mesh generation in parallel distributed (equivalent to Generator.octree2Struct in parallel)
+Apps
+Requires: C++ compiler, python > 2.7, numpy > 1.0, All Cassiopee modules
 ===============================================================================
diff --git a/Cassiopee/CPlot/CPlot/Data.cpp b/Cassiopee/CPlot/CPlot/Data.cpp
@@ -336,7 +336,7 @@ void Data::initState()
 
   // Styles
   ptrState->meshStyle = 2;
-  ptrState->solidStyle = 1;
+  ptrState->solidStyle = 0;
   ptrState->scalarStyle = 0;
   ptrState->vectorStyle = 0;
   ptrState->vectorScale = 100.f;

diff --git a/Cassiopee/CPlot/CPlot/Decorator.py b/Cassiopee/CPlot/CPlot/Decorator.py
@@ -276,7 +276,7 @@ def xyz2Pixel(Xs):
 # Draw an arrow. X2 is the arrow head.
 #==========================================================
 def createArrow(ax, X1, X2, width=0.001, text=None, textSize=10, shiftText=(0,0), **kwargs):
-    """Draw on arrow."""
+    """Draw an arrow on figure."""
     poss = xyz2Pixel([X1,X2])
     pos1x, pos1y = poss[0]; pos2x, pos2y = poss[1]
     ax.arrow(pos1x, pos1y, pos2x-pos1x, pos2y-pos1y, width=width, length_includes_head=True, **kwargs)

diff --git a/Cassiopee/CPlot/apps/validCassiopee.py b/Cassiopee/CPlot/apps/validCassiopee.py
@@ -917,7 +917,6 @@ def runTests():
         if STOP == 1: STOP = 0; displayStatus(0); return
     displayStatus(0)
     THREAD=None
-    if len(selection) == len(TESTS): notifyValidOK()
     writeSessionLog()
 
 def runTestsInThread():
@@ -1724,7 +1723,7 @@ def purgeSessionLogs(n):
         file.add_command(label='Load last session', command=loadSessionWithArgs)
         file.add_command(label='Purge session', command=buildTestList)
         file.add_command(label='Export to text file', command=export2Text)
-        file.add_command(label='Notify Ready for commit', command=notifyValidOK)
+        #file.add_command(label='Notify Ready for commit', command=notifyValidOK)
         file.add_command(label='Quit', command=Quit, accelerator='Ctrl+Q')
         view.add_command(label='Show FAILED', command=showFilter)
         showFilterWithArgs = partial(showFilter, "FAILEDMEM")