Changeset 1240


Ignore:
Timestamp:
10/05/15 15:52:57 (8 years ago)
Author:
sdipsl
Message:
  • reorganize Ada headers (group some options together)
  • simplify strings
Location:
trunk/libIGCM
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libIGCM/AA_job

    r1238 r1240  
    1616#-Q- curie # Below specific options that can be activated  
    1717#-Q- curie ##MSUB -q ivybridge         # Option for Airain 
    18  
    1918#-Q- curie 
    2019#-Q- curie BATCH_NUM_PROC_TOT=$BRIDGE_MSUB_NPROC 
     
    2625#-Q- ada # Job name  
    2726#-Q- ada # @ job_name = ::Jobname:: 
    28 #-Q- ada # Job type 
    29 #-Q- ada # @ job_type = parallel 
    3027#-Q- ada # Standard output file name 
    3128#-Q- ada # @ output = Script_Output_::Jobname::.000001 
    3229#-Q- ada # Error output file name 
    3330#-Q- ada # @ error = Script_Output_::Jobname::.000001 
     31#-Q- ada # Job type 
     32#-Q- ada # @ job_type = parallel 
    3433#-Q- ada # Total number of tasks 
    3534#-Q- ada # @ total_tasks = ::JobNumProcTot:: 
    36 #-Q- ada # @ environment = "BATCH_NUM_PROC_TOT=::JobNumProcTot::" ; wall_clock_limit=$(wall_clock_limit) 
     35#-Q- ada # Specific option for OpenMP parallelization: Number of OpenMP threads per MPI task 
     36#-Q- ada # @ parallel_threads = ::openMPthreads:: 
    3737#-Q- ada # Maximum CPU time per task hh:mm:ss 
    3838#-Q- ada # @ wall_clock_limit = 1:00:00 
    39 #-Q- ada # Specific option for OpenMP parallelization: Number of OpenMP threads per MPI task 
    40 #-Q- ada # @ parallel_threads = ::openMPthreads:: 
     39#-Q- ada # @ environment = "BATCH_NUM_PROC_TOT=::JobNumProcTot::" ; wall_clock_limit=$(wall_clock_limit) 
    4140#-Q- ada # End of the header options 
    4241#-Q- ada # @ queue 
  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

    r1239 r1240  
    957957    # SPMD + OMP only 
    958958    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
    959         -e "s/@\ job_type\ =\ parallel/@\ job_type\ =\ serial/" \ 
     959        -e "s/@ job_type = parallel/@ job_type = serial/" \ 
    960960        -e "/::JobNumProcTot::/d"                  \ 
    961961      ${file} > ${file}.tmp 
     
    964964    # SEQUENTIAL THEN 
    965965    sed -e "s/::JobNumProcTot::/1/"                \ 
    966         -e "s/@\ job_type\ =\ parallel/@\ job_type\ =\ serial/" \ 
     966        -e "s/@ job_type = parallel/@ job_type = serial/" \ 
    967967        -e "/::openMPthreads::/d"                  \ 
    968968      ${file} > ${file}.tmp 
  • trunk/libIGCM/libIGCM_sys/libIGCM_sys_curie.ksh

    r1239 r1240  
    11151115    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
    11161116        -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
    1117         -e "/#MSUB\ -x/d"                          \ 
     1117        -e "/#MSUB -x/d"                           \ 
    11181118        -e "/--cpu_bind=none/d"                    \ 
    11191119      ${file} > ${file}.tmp 
     
    11231123    sed -e "s/::JobNumProcTot::/${mpiTasks}/"      \ 
    11241124        -e "/::openMPthreads::/d"                  \ 
    1125         -e "/#MSUB\ -x/d"                          \ 
     1125        -e "/#MSUB -x/d"                           \ 
    11261126        -e "/--cpu_bind=none/d"                    \ 
    11271127      ${file} > ${file}.tmp 
     
    11311131    sed -e "s/::openMPthreads::/${openMPthreads}/" \ 
    11321132        -e "/::JobNumProcTot::/d"                  \ 
    1133         -e "/#MSUB\ -x/d"                          \ 
     1133        -e "/#MSUB -x/d"                           \ 
    11341134        -e "/--cpu_bind=none/d"                    \ 
    11351135      ${file} > ${file}.tmp 
     
    11391139    sed -e "s/::JobNumProcTot::/1/"                \ 
    11401140        -e "/::openMPthreads::/d"                  \ 
    1141         -e "/#MSUB\ -x/d"                          \ 
     1141        -e "/#MSUB -x/d"                           \ 
    11421142        -e "/--cpu_bind=none/d"                    \ 
    11431143      ${file} > ${file}.tmp 
Note: See TracChangeset for help on using the changeset viewer.