Changeset 1239


Ignore:
Timestamp:
10/05/15 15:26:52 (9 years ago)
Author:
sdipsl
Message:
  • continuation of r1238 for ciclad, obelix, default and iitm.
  • correct typo
Location:
trunk/libIGCM/libIGCM_sys
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

    r1238 r1239  
    856856 
    857857#D-#================================================== 
    858 #D-function IGCM_sys_desactiv_variables 
     858#D-function IGCM_sys_activ_variables 
    859859#D-* Purpose: set environement variables prior to execution 
    860860#D-* Examples: 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_ciclad.ksh

    r1230 r1239  
    744744 
    745745#D-#================================================== 
    746 #D-function IGCM_sys_desactiv_variables 
     746#D-function IGCM_sys_activ_variables 
    747747#D-* Purpose: set environement variables prior to execution 
    748748#D-* Examples: 
    … …  
    789789 
    790790  IGCM_debug_PopStack "IGCM_sys_desactiv_variables" 
     791} 
     792 
     793############################################################ 
     794# Update job headers to be used by the scheduler 
     795 
     796#D-#================================================== 
     797#D-function IGCM_sys_updateHeaders 
     798#D-* Purpose: Update job headers to be used by the scheduler 
     799#D-* Examples: IGCM_sys_updateHeaders /path/to/Job_MYEXP 
     800#D- 
     801function IGCM_sys_updateHeaders { 
     802  IGCM_debug_PushStack "IGCM_sys_updateHeaders" 
     803  if ( $DEBUG_sys ) ; then 
     804    echo "IGCM_sys_updateHeaders" 
     805  fi 
     806  typeset file 
     807  file=$1 
     808 
     809  if [ ${executionType} -eq 1 ] ; then 
     810    # MPMD + MPI 
     811    sed -e "/::openMPthreads::/d"                  \ 
     812        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     813      ${file} > ${file}.tmp 
     814 
     815  elif [ ${executionType} -eq 2 ] ; then 
     816    # MPMD + MPI + OMP 
     817    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     818        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     819      ${file} > ${file}.tmp 
     820 
     821  elif [ ${executionType} -eq 3 ] ; then 
     822    # SPMD + MPI/OMP 
     823    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     824        -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     825      ${file} > ${file}.tmp 
     826 
     827  elif [ ${executionType} -eq 4 ] ; then 
     828    # SPMD + MPI only 
     829    sed -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     830        -e "/::openMPthreads::/d"                  \ 
     831      ${file} > ${file}.tmp 
     832 
     833  elif [ ${executionType} -eq 5 ] ; then 
     834    # SPMD + OMP only 
     835    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     836        -e "/::JobNumProcTot::/d"                  \ 
     837      ${file} > ${file}.tmp 
     838 
     839  elif [ ${executionType} -eq 6 ] ; then 
     840    # SEQUENTIAL THEN 
     841    sed -e "s/::JobNumProcTot::/1/"                \ 
     842        -e "/::openMPthreads::/d"                  \ 
     843      ${file} > ${file}.tmp 
     844 
     845  fi 
     846 
     847  IGCM_sys_Mv ${file}.tmp ${file} 
     848 
     849  IGCM_debug_PopStack "IGCM_sys_updateHeaders" 
    791850} 
    792851 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

    r1238 r1239  
    10361036 
    10371037#D-#================================================== 
    1038 #D-function IGCM_sys_desactiv_variables 
     1038#D-function IGCM_sys_activ_variables 
    10391039#D-* Purpose: set environement variables prior to execution 
    10401040#D-* Examples: 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_default.ksh

    r1230 r1239  
    704704 
    705705#D-#================================================== 
    706 #D-function IGCM_sys_desactiv_variables 
     706#D-function IGCM_sys_activ_variables 
    707707#D-* Purpose: set environement variables prior to execution 
    708708#D-* Examples: 
    … …  
    747747 
    748748  IGCM_debug_PopStack "IGCM_sys_desactiv_variables" 
     749} 
     750 
     751############################################################ 
     752# Update job headers to be used by the scheduler 
     753 
     754#D-#================================================== 
     755#D-function IGCM_sys_updateHeaders 
     756#D-* Purpose: Update job headers to be used by the scheduler 
     757#D-* Examples: IGCM_sys_updateHeaders /path/to/Job_MYEXP 
     758#D- 
     759function IGCM_sys_updateHeaders { 
     760  IGCM_debug_PushStack "IGCM_sys_updateHeaders" 
     761  if ( $DEBUG_sys ) ; then 
     762    echo "IGCM_sys_updateHeaders" 
     763  fi 
     764  typeset file 
     765  file=$1 
     766 
     767  if [ ${executionType} -eq 1 ] ; then 
     768    # MPMD + MPI 
     769    sed -e "/::openMPthreads::/d"                  \ 
     770        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     771      ${file} > ${file}.tmp 
     772 
     773  elif [ ${executionType} -eq 2 ] ; then 
     774    # MPMD + MPI + OMP 
     775    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     776        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     777      ${file} > ${file}.tmp 
     778 
     779  elif [ ${executionType} -eq 3 ] ; then 
     780    # SPMD + MPI/OMP 
     781    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     782        -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     783      ${file} > ${file}.tmp 
     784 
     785  elif [ ${executionType} -eq 4 ] ; then 
     786    # SPMD + MPI only 
     787    sed -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     788        -e "/::openMPthreads::/d"                  \ 
     789      ${file} > ${file}.tmp 
     790 
     791  elif [ ${executionType} -eq 5 ] ; then 
     792    # SPMD + OMP only 
     793    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     794        -e "/::JobNumProcTot::/d"                  \ 
     795      ${file} > ${file}.tmp 
     796 
     797  elif [ ${executionType} -eq 6 ] ; then 
     798    # SEQUENTIAL THEN 
     799    sed -e "s/::JobNumProcTot::/1/"                \ 
     800        -e "/::openMPthreads::/d"                  \ 
     801      ${file} > ${file}.tmp 
     802 
     803  fi 
     804 
     805  IGCM_sys_Mv ${file}.tmp ${file} 
     806 
     807  IGCM_debug_PopStack "IGCM_sys_updateHeaders" 
    749808} 
    750809 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_iitm.ksh

    r1230 r1239  
    696696 
    697697#D-#================================================== 
    698 #D-function IGCM_sys_desactiv_variables 
     698#D-function IGCM_sys_activ_variables 
    699699#D-* Purpose: set environement variables prior to execution 
    700700#D-* Examples: 
    … …  
    739739 
    740740  IGCM_debug_PopStack "IGCM_sys_desactiv_variables" 
     741} 
     742 
     743############################################################ 
     744# Update job headers to be used by the scheduler 
     745 
     746#D-#================================================== 
     747#D-function IGCM_sys_updateHeaders 
     748#D-* Purpose: Update job headers to be used by the scheduler 
     749#D-* Examples: IGCM_sys_updateHeaders /path/to/Job_MYEXP 
     750#D- 
     751function IGCM_sys_updateHeaders { 
     752  IGCM_debug_PushStack "IGCM_sys_updateHeaders" 
     753  if ( $DEBUG_sys ) ; then 
     754    echo "IGCM_sys_updateHeaders" 
     755  fi 
     756  typeset file 
     757  file=$1 
     758 
     759  if [ ${executionType} -eq 1 ] ; then 
     760    # MPMD + MPI 
     761    sed -e "/::openMPthreads::/d"                  \ 
     762        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     763      ${file} > ${file}.tmp 
     764 
     765  elif [ ${executionType} -eq 2 ] ; then 
     766    # MPMD + MPI + OMP 
     767    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     768        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     769      ${file} > ${file}.tmp 
     770 
     771  elif [ ${executionType} -eq 3 ] ; then 
     772    # SPMD + MPI/OMP 
     773    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     774        -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     775      ${file} > ${file}.tmp 
     776 
     777  elif [ ${executionType} -eq 4 ] ; then 
     778    # SPMD + MPI only 
     779    sed -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     780        -e "/::openMPthreads::/d"                  \ 
     781      ${file} > ${file}.tmp 
     782 
     783  elif [ ${executionType} -eq 5 ] ; then 
     784    # SPMD + OMP only 
     785    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     786        -e "/::JobNumProcTot::/d"                  \ 
     787      ${file} > ${file}.tmp 
     788 
     789  elif [ ${executionType} -eq 6 ] ; then 
     790    # SEQUENTIAL THEN 
     791    sed -e "s/::JobNumProcTot::/1/"                \ 
     792        -e "/::openMPthreads::/d"                  \ 
     793      ${file} > ${file}.tmp 
     794 
     795  fi 
     796 
     797  IGCM_sys_Mv ${file}.tmp ${file} 
     798 
     799  IGCM_debug_PopStack "IGCM_sys_updateHeaders" 
    741800} 
    742801 

  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh

    r1230 r1239  
    728728 
    729729#D-#================================================== 
    730 #D-function IGCM_sys_desactiv_variables 
     730#D-function IGCM_sys_activ_variables 
    731731#D-* Purpose: set environement variables prior to execution 
    732732#D-* Examples: 
    … …  
    771771 
    772772  IGCM_debug_PopStack "IGCM_sys_desactiv_variables" 
     773} 
     774 
     775############################################################ 
     776# Update job headers to be used by the scheduler 
     777 
     778#D-#================================================== 
     779#D-function IGCM_sys_updateHeaders 
     780#D-* Purpose: Update job headers to be used by the scheduler 
     781#D-* Examples: IGCM_sys_updateHeaders /path/to/Job_MYEXP 
     782#D- 
     783function IGCM_sys_updateHeaders { 
     784  IGCM_debug_PushStack "IGCM_sys_updateHeaders" 
     785  if ( $DEBUG_sys ) ; then 
     786    echo "IGCM_sys_updateHeaders" 
     787  fi 
     788  typeset file 
     789  file=$1 
     790 
     791  if [ ${executionType} -eq 1 ] ; then 
     792    # MPMD + MPI 
     793    sed -e "/::openMPthreads::/d"                  \ 
     794        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     795      ${file} > ${file}.tmp 
     796 
     797  elif [ ${executionType} -eq 2 ] ; then 
     798    # MPMD + MPI + OMP 
     799    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     800        -e "s/::JobNumProcTot::/${coreNumber}/"    \ 
     801      ${file} > ${file}.tmp 
     802 
     803  elif [ ${executionType} -eq 3 ] ; then 
     804    # SPMD + MPI/OMP 
     805    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     806        -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     807      ${file} > ${file}.tmp 
     808 
     809  elif [ ${executionType} -eq 4 ] ; then 
     810    # SPMD + MPI only 
     811    sed -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
     812        -e "/::openMPthreads::/d"                  \ 
     813      ${file} > ${file}.tmp 
     814 
     815  elif [ ${executionType} -eq 5 ] ; then 
     816    # SPMD + OMP only 
     817    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
     818        -e "/::JobNumProcTot::/d"                  \ 
     819      ${file} > ${file}.tmp 
     820 
     821  elif [ ${executionType} -eq 6 ] ; then 
     822    # SEQUENTIAL THEN 
     823    sed -e "s/::JobNumProcTot::/1/"                \ 
     824        -e "/::openMPthreads::/d"                  \ 
     825      ${file} > ${file}.tmp 
     826 
     827  fi 
     828 
     829  IGCM_sys_Mv ${file}.tmp ${file} 
     830 
     831  IGCM_debug_PopStack "IGCM_sys_updateHeaders" 
    773832} 
    774833 
Note: See TracChangeset for help on using the changeset viewer.