Changeset 1409 for trunk


Ignore:
Timestamp:
08/25/17 12:39:18 (7 years ago)
Author:
sdipsl
Message:
  • #337 and #338 source the appropriate .env_intel depending on compiler used. Dont use .atlas something anymore.
  • #337 and #338 on Curie only for the moment.
  • #336 load the appropriate nco on Ada
Location:
trunk/libIGCM
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/AA_SaveSourceModifications

    r1356 r1409  
    1515#-Q- ada # #  ADA       IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_additionnal

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_atlas_LMDZ

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_atlas_ORCA_LIM

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_atlas_ORCHIDEE

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_atlas_PISCES

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_create_multi_se

    r1377 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_create_se

    r1377 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_create_ts

    r1393 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_job

    r1392 r1409  
    415415 
    416416  # ------------------------------------------------------------------ 
     417  #D-   4.9 GET BINARY FILES 
     418  #D-       - USED BY AT EACH EXECUTION. 
     419  #D-       - CHECK BINARIES HAS BEEN COMPILED WITH THE SAME COMPILER 
     420  #D-       - RELOAD THE APPROPRIATE ENVIRONMENT THE FIRST TIME IF NEEDED 
     421  # ------------------------------------------------------------------ 
     422  IGCM_comp_GetInputBinaryFiles 
     423 
     424  # ------------------------------------------------------------------ 
    417425  # Test if all was right before Update 
    418426  # ------------------------------------------------------------------ 
    … …  
    421429  #D- 
    422430  # ------------------------------------------------------------------ 
    423   #D-   4.9 ACTIVATE RUNNING ENVIRONNEMENT VARIABLES 
     431  #D-   4.10 ACTIVATE RUNNING ENVIRONNEMENT VARIABLES 
     432  #D-       - including module load associated to compiler & tools 
     433  #D-       - .env_intel17.0.2_curie 
     434  #D-       - .env_netcdf4.3.3.1_curie 
    424435  # ------------------------------------------------------------------ 
    425436  IGCM_sys_activ_variables 
    … …  
    427438  #D- 
    428439  # ------------------------------------------------------------------ 
    429   #D-   4.10 UPDATE ParametersFiles 
     440  #D-   4.11 UPDATE ParametersFiles 
    430441  #D-        - (.def, namelist ...) 
    431442  #D-        - with current value of (ORCA_NIT00, ORCA_LRSTAR, RAZ_DATE, ...) 

  • trunk/libIGCM/AA_metrics_LMDZ

    r1365 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_metrics_NEMO

    r1379 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_metrics_ORCHIDEE

    r1365 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_monitoring

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_pack_debug

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_pack_output

    r1356 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_pack_restart

    r1400 r1409  
    1515#-Q- ada ## ADA         IDRIS ## 
    1616#-Q- ada ####################### 
    17 #-Q- ada # @ job_type = serial 
     17#-Q- ada # @ job_type = mpich 
    1818#-Q- ada # @ requirements = (Feature == "prepost") 
    1919#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/AA_rebuild_fromWorkdir

    r1356 r1409  
    1717#-Q- ada ## ADA         IDRIS ## 
    1818#-Q- ada ####################### 
    19 #-Q- ada # @ job_type = serial 
     19#-Q- ada # @ job_type = mpich 
    2020#-Q- ada # @ requirements = (Feature == "prepost") 
    2121#-Q- ada # Temps Elapsed max. d'une requete hh:mm:ss 

  • trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh

    r1401 r1409  
    955955 
    956956#======================================================================= 
     957function IGCM_comp_GetInputBinaryFiles 
     958{ 
     959  IGCM_debug_PushStack "IGCM_comp_GetInputBinaryFiles" 
     960 
     961  # Debug Print : 
     962  echo 
     963  IGCM_debug_Print 1 "IGCM_comp_GetInputBinaryFiles" 
     964  echo 
     965 
     966  # Clean up previous pass 
     967  [ -f ${RUN_DIR}/compiler.txt ] && rm -f ${RUN_DIR}/compiler.txt 
     968 
     969  typeset comp ExeNameIn ExeNameOut 
     970  typeset compilerNmbr compilerUnit compilerFull 
     971  for comp in ${config_ListOfComponents[*]} ; do 
     972    # Define component 
     973 
     974    # Copy executable for this component 
     975    eval ExeNameIn=\${config_Executable_${comp}[0]} 
     976    eval ExeNameOut=\${config_Executable_${comp}[1]} 
     977 
     978    # If missing executable and DRYRUN is set to 0 or 1  then stop! 
     979    if [ ${DRYRUN} -le 1 ] && [ X${ExeNameIn} != X\"\" ] &&  [ ! -f ${R_EXE}/${ExeNameIn} ] ; then 
     980      IGCM_debug_Exit "IGCM_comp_GetInputBinaryFiles missing executable ${ExeNameIn}" 
     981    fi 
     982 
     983    if [ ${Period} -eq 1 ] && [ -f ${R_EXE}/${ExeNameIn} ] ; then 
     984      eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut} 
     985      if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 
     986        eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut} 
     987      fi 
     988    elif [ -f ${R_EXE}/${ExeNameIn} ] && [ ! -f ${RUN_DIR}/${ExeNameOut} ] ; then 
     989      eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut} 
     990      if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 
     991        eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut} 
     992      fi 
     993    fi 
     994 
     995    if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 
     996      # Get the compiler version 
     997      compilerFull=$( strings ${RUN_DIR}/${ExeNameOut}  | grep "RTL Message Catalog" | gawk '{print $6}' | gawk -F. '{print $1}' ) 
     998      compilerVersion=$( strings ${RUN_DIR}/${ExeNameOut}  | grep "RTL Message Catalog" | gawk '{print $6}' | gawk -F. '{print $1}' ) 
     999      # Save it 
     1000      echo $compilerFull >> ${RUN_DIR}/compiler.txt 
     1001      IGCM_debug_Print 1 "${RUN_DIR}/${ExeNameOut} has been compiled with ${compilerFull}" 
     1002    fi 
     1003  done 
     1004 
     1005  compilerNmbr=$( cat ${RUN_DIR}/compiler.txt | wc -l ) 
     1006  compilerUnit=$( cat ${RUN_DIR}/compiler.txt | sort | uniq -c ) 
     1007 
     1008  if [ ${compilerNmbr} -ne ${compilerUnit} ]; then 
     1009    IGCM_debug_Exit "Binaries has not been compiled with the same compiler version" 
     1010  fi 
     1011 
     1012  IGCM_debug_PopStack "IGCM_comp_GetInputBinaryFiles" 
     1013} 
     1014 
     1015#======================================================================= 
    9571016function IGCM_comp_PeriodStart 
    9581017{ 
    … …  
    14281487  IGCM_debug_PushStack "IGCM_comp_Update" 
    14291488 
    1430     # Debug Print : 
     1489  # Debug Print : 
    14311490  echo 
    14321491  IGCM_debug_Print 1 "IGCM_comp_Update" 
    14331492  echo 
    14341493 
    1435   typeset ExeNameIn ExeNameOut 
    14361494  typeset comp compname comptagname 
    14371495  for comp in ${config_ListOfComponents[*]} ; do 
    … …  
    14391497    eval compname=\${config_ListOfComponents_${comp}[0]} > /dev/null 2>&1 
    14401498    eval comptagname=\${config_ListOfComponents_${comp}[1]} > /dev/null 2>&1 
    1441  
    1442     # Copy executable for this component 
    1443     eval ExeNameIn=\${config_Executable_${comp}[0]} 
    1444     eval ExeNameOut=\${config_Executable_${comp}[1]} 
    1445  
    1446     # If missing executable and DRYRUN is set to 0 or 1  then stop! 
    1447     if [ ${DRYRUN} -le 1 ] && [ X${ExeNameIn} != X\"\" ] &&  [ ! -f ${R_EXE}/${ExeNameIn} ] ; then 
    1448       IGCM_debug_Exit "IGCM_comp_Update missing executable ${ExeNameIn}" 
    1449     fi 
    1450  
    1451     if [ ${Period} -eq 1 ] && [ -f ${R_EXE}/${ExeNameIn} ] ; then 
    1452       eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut} 
    1453       if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 
    1454         eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut} 
    1455       fi 
    1456     elif [ -f ${R_EXE}/${ExeNameIn} ] && [ ! -f ${RUN_DIR}/${ExeNameOut} ] ; then 
    1457       eval IGCM_sys_Cp ${R_EXE}/${ExeNameIn} ${ExeNameOut} 
    1458       if [ -f ${RUN_DIR}/${ExeNameOut} ] ; then 
    1459         eval IGCM_sys_Chmod +rx ${RUN_DIR}/${ExeNameOut} 
    1460       fi 
    1461     fi 
    14621499 
    14631500    # Debug Print 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

    r1392 r1409  
    9393#==================================================== 
    9494if [ X${TaskType} = Xcomputing ] ; then 
    95   module load python/2.7.8 > /dev/null 2>&1 
    96   . /ccc/cont003/home/dsm/p86ipsl/.atlas_env_netcdf4.3.3.1_hdf5_parallel_curie_ksh > /dev/null 2>&1 
    97 # to run with netcdf 3.6.3 ie compilation done before 17/2/2014 
    98 # uncomment 2 lines : 
    99 #  module unload netcdf 
    100 #  module load netcdf/3.6.3 
     95  IGCM_debug_Print 1 "Module will be loaded once we know the compiler version" 
    10196else 
    102   . /ccc/cont003/home/dsm/p86ipsl/.atlas_env_netcdf4.3.3.1_hdf5_parallel_curie_ksh > /dev/null 2>&1 
     97  . /ccc/cont003/home/dsm/p86ipsl/.env_intel17.0.2_curie   > /dev/null 2>&1 
     98  . /ccc/cont003/home/dsm/p86ipsl/.env_netcdf4.3.3.1_curie > /dev/null 2>&1 
     99  . /ccc/cont003/home/dsm/p86ipsl/.env_atlas_curie         > /dev/null 2>&1 
    103100  export PCMDI_MP=/ccc/work/cont003/igcmg/igcmg/PCMDI-MP 
    104101  export UVCDAT_ANONYMOUS_LOG=FALSE 
    … …  
    10551052 
    10561053# -------------------------------------------------------------------- 
     1054#D- MODULE specifications 
     1055# -------------------------------------------------------------------- 
     1056 
     1057  if [ X${compilerVersion} == XV17 ] ; then 
     1058      . /ccc/cont003/home/dsm/p86ipsl/.env_intel17.0.2_curie   > /dev/null 2>&1 
     1059  elif [ X${compilerVersion} == XV14 ] ; then 
     1060      . /ccc/cont003/home/dsm/p86ipsl/.env_intel14.0.3_curie   > /dev/null 2>&1 
     1061  else 
     1062    IGCM_debug_Exit "This compiler version is not yet supported : ${compilerVersion}" 
     1063  fi 
     1064  . /ccc/cont003/home/dsm/p86ipsl/.env_netcdf4.3.3.1_curie > /dev/null 2>&1 
     1065 
     1066  # Keep track of this 
     1067  [ ! X${TaskType} = Xchecking ] && IGCM_debug_Print 1 "List of loaded modules:" 
     1068  [ ! X${TaskType} = Xchecking ] && module list 
     1069 
     1070# -------------------------------------------------------------------- 
    10571071#D- MPI specifications 
    10581072# -------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.