All: portage craycc 5

onera · Oct 20, 2024 · ebca28d · ebca28d
1 parent 39f7ffd
commit ebca28d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/Cassiopee/Envs/sh_Cassiopee_local b/Cassiopee/Envs/sh_Cassiopee_local
@@ -764,11 +764,16 @@ elif [ "$MAC" = "adastra_cpu" ]; then
     export ELSAPROD=$ELSAPROD$EXT
     export OMP_NUM_THREADS=48
     export PRODMODE=1
-    module load PrgEnv-cray
+    module purge
+    #module load craype-x86-genoa
+    #module load PrgEnv-cray
+    #module load cray-mpich/8.1.28
+    #module load cray-libsci/23.05.1.4
+
+    module load CCE-CPU-3.1.0
     module load cray-python/3.11.5
-    module load cray-mpich/8.1.28
     module load cray-hdf5-parallel/1.12.2.5
-    module load cray-libsci/23.05.1.4
+
     export LD_LIBRARY_PATH="$CRAY_LD_LIBRARY_PATH":"$LD_LIBRARY_PATH"
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH":"/opt/cray/pe/python/3.11.5/lib"
     export PYTHONEXE=python3

diff --git a/Cassiopee/KCore/KCore/Nuga/include/ngon_t.hxx b/Cassiopee/KCore/KCore/Nuga/include/ngon_t.hxx
@@ -4643,7 +4643,7 @@ E_Int remove_phs(const std::set<E_Int>& PHslist)
         if (Kn == IDX_NONE)
         {
           ++nb_neighs;
-          assert(ng.PGs._type[Fn] == 0);
+          //assert(ng.PGs._type[Fn] == 0);
         }
       }
     }

diff --git a/Cassiopee/KCore/installBase.py b/Cassiopee/KCore/installBase.py
@@ -716,7 +716,7 @@
 'adastra_cpu': [ 'Machine CINES Cray',
 'crayftn', # f77compiler
 'crayftn', # f90compiler
-'craycxx', # Cppcompiler
+'craycc', # Cppcompiler
 [], # CppAdditionalOptions
 [], # f77AdditionalOptions
 False, # useOMP