topo2vol: use CEA repository

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index abfcd8e58564de52367a79f60f76d1bd7820d4f6..b910bbd162bb53f88e02fda982e1e9a07308cada 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -119,7 +119,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: '1.3.0'
+        topo2volmesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index ae2d357e093ba51d5c8720f52732929212a71e93..f343f6fe19690ad7684da2eae17b17b3fbbf19b3 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -118,7 +118,7 @@ APPLICATION :
         tbb : 'native'
         tcl : 'native'
         tk : 'native'
-        topo2volmesh: '1.3.0'
+        topo2volmesh: 'develop'
         urllib3 : 'native'
         URANIE : '4.5.0'
 

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index b3854fa7e299550793b8a7774658dc6b07020838..fb38e3897fadd5e24c9bba5fdcae7b5a901c7ffb 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -117,7 +117,7 @@ APPLICATION :
         tbb : '2019_U8'
         tcl : '8.6.0'
         tk : '8.6.0'
-        topo2volmesh: '1.3.0'
+        topo2volmesh: 'develop'
         urllib3 : '1.23'
         URANIE : '4.5.0'
         # SALOME MODULES :

diff --git a/products/patches/smesh_spns-19079_topo2volmesh.patch b/products/patches/smesh_spns-19079_topo2volmesh.patch
index 832f448e561532932df2b0cfde6203966a18edb1..513a1883dba9ddd04111dd4df618c29614abc552 100644 (file)
--- a/products/patches/smesh_spns-19079_topo2volmesh.patch
+++ b/products/patches/smesh_spns-19079_topo2volmesh.patch
@@ -560,7 +560,7 @@ diff -Naur SMESH_ref/src/Tools/Topo2VolMeshPlug/Topo2VolMeshPluginDialog.ui SMES
 +     </font>
 +    </property>
 +    <property name="text">
-+     <string>Mesh file (XYZ format)</string>
++     <string>DEM input file</string>
 +    </property>
 +    <property name="iconSize">
 +     <size>

diff --git a/products/topo2volmesh.pyconf b/products/topo2volmesh.pyconf
index 03270c2ca6caeb3f394b0683a3fd3db2710f5c5b..7c0f722e27449a87a154ca08a87e2e4ae5ba790a 100644 (file)
--- a/products/topo2volmesh.pyconf
+++ b/products/topo2volmesh.pyconf
@@ -3,7 +3,12 @@ default :
     name : "topo2volmesh"
     build_source : "script"
     compil_script :  $name + $VARS.scriptExtension
-    get_source : "archive"
+    get_source : "git"
+    git_info:
+    {
+        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/top_ii_mesh.git"
+        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + /top_ii_mesh.git"
+    }
     system_info :
     {
         rpm : []
@@ -27,9 +32,3 @@ default :
       single_install_dir : "yes"
     }
 }
-
-version_1_3_0:
-{
-  compil_script : "topo2volmesh-1.3.0.sh"
-  patches : ['topo2volmesh-1.3.0-00001.patch']
-}