Changeset 1358

Timestamp:

10/15/16 18:27:39 (8 years ago)

Author:

sdipsl

Message:

• load python module before netcdf modules. So that netcdf/hdf libraries path from python wont affect dynamically linked binaries to "classic" netcdf/hdf librairies.
• export explicitely PCMDI_MP variable

Location:

trunk/libIGCM/libIGCM_sys

Files:

• libIGCM_sys_ada.ksh (modified) (1 diff)
• libIGCM_sys_ciclad.ksh (modified) (1 diff)
• libIGCM_sys_curie.ksh (modified) (2 diffs)
• libIGCM_sys_obelix.ksh (modified) (1 diff)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -94 +94 @@
 source /smplocal/pub/Modules/default/init/ksh
 if ( [ "X${LOADL_STEP_TYPE}" = "XPARALLEL" ] || [ "X${LOADL_STEP_TYPE}" = "XSERIAL" ] ) ; then
+  module load python/2.7.10 > /dev/null 2>&1
   . /smphome/rech/psl/rpsl035/.atlas_env_ada_intel_2013_0_bash > /dev/null 2>&1
-  module load python/2.7.10 > /dev/null 2>&1
 else
   module load intel/2016.2 > /dev/null 2>&1
   . /smphome/rech/psl/rpsl035/.atlas_env_ada_bash > /dev/null 2>&1
-  PCMDI_MP=/workgpfs/rech/psl/rpsl035/PCMDI-MP
+  export PCMDI_MP=/workgpfs/rech/psl/rpsl035/PCMDI-MP
   export UVCDAT_ANONYMOUS_LOG=no
 fi

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ciclad.ksh

@@ -99 +99 @@
     # At ciclad
     export PATH=${PATH}:/home/igcmg/rebuild/src_X64_CICLAD/modipsl_v2_2_3_netcdf4.2/bin/
+    module load python/2.7-anaconda > /dev/null 2>&1
     . /home/igcmg/.atlas_env_ciclad_ksh
-    module load python/2.7-anaconda > /dev/null 2>&1
 else
     # At climserv use the same files stored at ciclad but adapt the path
     export PATH=${PATH}:/ciclad-home/igcmg/rebuild/src_X64_CICLAD/modipsl_v2_2_3_netcdf4.2/bin/
+    module load python/2.7-anaconda > /dev/null 2>&1
     . /ciclad-home/igcmg/.atlas_env_ciclad_ksh
-    module load python/2.7-anaconda > /dev/null 2>&1
 fi
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

@@ -93 +93 @@
 #====================================================
 if [ X${TaskType} = Xcomputing ] ; then
+  module load python/2.7.8 > /dev/null 2>&1
   . /ccc/cont003/home/dsm/p86ipsl/.atlas_env_netcdf4.3.3.1_hdf5_parallel_curie_ksh > /dev/null 2>&1
-  module load python/2.7.8 > /dev/null 2>&1
 # to run with netcdf 3.6.3 ie compilation done before 17/2/2014
 # uncomment 2 lines :
@@ -101 +101 @@
 else
   . /ccc/cont003/home/dsm/p86ipsl/.atlas_env_netcdf4.3.3.1_hdf5_parallel_curie_ksh > /dev/null 2>&1
-  PCMDI_MP=/ccc/work/cont003/igcmg/igcmg/PCMDI-MP
+  export PCMDI_MP=/ccc/work/cont003/igcmg/igcmg/PCMDI-MP
   export UVCDAT_ANONYMOUS_LOG=no
 fi

trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

@@ -91 +91 @@
 # Set environment tools (ferret, nco, cdo, rebuild, ...)
 #====================================================
+module load python/2.7.5
 . /home/users/igcmg/.atlas_env_asterix_ksh
-module load python/2.7.5
 export PATH=${PATH}:/home/users/igcmg/rebuild/bin/