Changeset 620

Timestamp:

11/25/17 17:22:38 (6 years ago)

Author:

dubos

Message:

devel/unstructured : mesh partitioning

Location:

codes/icosagcm/devel/Python

Files:

• env/X64_CURIE.env (modified) (1 diff)
• env/linux.env (modified) (4 diffs)
• src/partition.c (added)
• src/unstructured.pyx (modified) (1 diff)
• test/fig_partition (added)
• test/py/partition.py (added)

codes/icosagcm/devel/Python/env/X64_CURIE.env

@@ -3 +3 @@
 
 # Needed for Intel OpenMP
-KERNELS_LDFLAGS="$NETCDF_LIBDIR $NETCDF_LIB -liomp5 $MKL_LIBS"
+KERNELS_LDFLAGS="$NETCDF_LIBDIR $NETCDF_LIB -liomp5 $MKL_LIBS $PARMETIS_LDFLAGS"

codes/icosagcm/devel/Python/env/linux.env

@@ +1 @@
+export CODEGEN_ENV_SET=yes
+
 #----------- Useful directories ---------
+
 BASEDIR=$(dirname ${BASH_SOURCE[0]})
 export BASEDIR=$(cd $BASEDIR/../.. ; pwd)
 
 #--------- To create shared libraries -------
+
 export F90=mpif90
 export LINK=$F90
@@ -21 +25 @@
 export FFLAGS="$FFLAGS_BASE $FFLAGS_PROD"
 
-#----------- To compile with cython ---------
-
 #---------------- To execute ----------------
 
@@ -31 +33 @@
 export PYTHON=$(which python)
 
-#--------------- Link --------------
-#export LDFLAGS="$PARMETIS_LDFLAGS"
-#export LIBS="-lparmetis"
-
-
-#-------------- Execute --------------
-
 # disable Intel OpenMP in MKL (loaded by numpy) to avoid conflict with our openMP
 export MKL_THREADING_LAYER=SEQUENTIAL
@@ -43 +38 @@
 # select a Matplotlib backend that works without an X11 connection
 export MPLBACKEND="agg"
-
-export CODEGEN_ENV_SET=yes

codes/icosagcm/devel/Python/src/unstructured.pyx

@@ -44 +44 @@
                      ['dynamico_init_hybrid', c_void_p,3],
                      ['dynamico_caldyn_unstructured', c_double, c_void_p,20],
-#                     ['dynamico_partition_graph', c_int,2, c_void_p,3, c_int, c_void_p],
+                     ['dynamico_partition_graph', c_int,2, c_void_p,3, c_int, c_void_p],
                      ])