Changeset 67
- Timestamp:
- 03/18/09 18:37:16 (15 years ago)
- Location:
- trunk/libIGCM
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/libIGCM/AA_additionnal
r63 r67 96 96 97 97 # DODS copy 98 [ -d ${R_SAVE}/${R_ATLAS} ] && IGCM_sys_Put_Dods ${R_ATLAS} 99 100 date 98 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 99 [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} -
trunk/libIGCM/AA_atlas_LMDZ
r63 r67 92 92 93 93 # DODS copy 94 [ -d ${R_SAVE}/${R_ATLAS} ] && IGCM_sys_Put_Dods ${R_ATLAS} 95 96 date 94 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 95 [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} -
trunk/libIGCM/AA_atlas_LMDZOR
r63 r67 105 105 106 106 # DODS copy 107 [ -d ${R_SAVE}/${R_ATLAS} ] && IGCM_sys_Put_Dods ${R_ATLAS} 108 109 date 107 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 108 [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} -
trunk/libIGCM/AA_atlas_ORCA_LIM
r63 r67 126 126 127 127 # DODS copy 128 [ -d ${R_SAVE}/${R_ATLAS} ] && IGCM_sys_Put_Dods ${R_ATLAS} 129 130 date 128 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 129 [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} -
trunk/libIGCM/AA_atlas_ORCHIDEE
r63 r67 106 106 107 107 # DODS copy 108 [ -d ${R_SAVE}/${R_ATLAS} ] && IGCM_sys_Put_Dods ${R_ATLAS} 109 110 date 108 IGCM_sys_TestDirArchive ${R_SAVE}/${R_ATLAS} 109 [ $? = 0 ] && IGCM_sys_Put_Dods ${R_ATLAS} -
trunk/libIGCM/AA_create_se
r66 r67 420 420 # DODS copy 421 421 for comp in ${config_ListOfComponents[*]} ; do 422 for SE_Dir in $( ls ${R_SAVE}/${comp}/Analyse/ 2>&1 | grep SE ) ; do 423 [ -d ${R_SAVE}/${comp}/Analyse/${SE_Dir} ] && IGCM_sys_Put_Dods ${comp}/Analyse/${SE_Dir} 424 done 422 IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/SE 423 [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/SE 425 424 done 426 425 -
trunk/libIGCM/AA_create_ts
r64 r67 711 711 # DODS copy 712 712 for comp in ${config_ListOfComponents[*]} ; do 713 for TS_Dir in $( ls ${R_SAVE}/${comp}/Analyse/ 2>&1 | grep TS_ ) ; do 714 [ -d ${R_SAVE}/${comp}/Analyse/${TS_Dir} ] && IGCM_sys_Put_Dods ${comp}/Analyse/${TS_Dir} 713 for TS_Dir in TS_YE TS_MO TS_DA TS_HF TS_INS ; do 714 IGCM_sys_TestDirArchive ${R_SAVE}/${comp}/Analyse/${TS_Dir} 715 [ $? = 0 ] && IGCM_sys_Put_Dods ${comp}/Analyse/${TS_Dir} 715 716 done 716 717 done -
trunk/libIGCM/libIGCM_comp/libIGCM_comp.ksh
r59 r67 430 430 431 431 eval Path_temp=\${Path_r}/${generic_restart_file_name_in} 432 nb_restart_file=$(IGCM_sys_ Nb_files_archive ${Path_temp}_????.nc)432 nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_temp}_????.nc) 433 433 434 434 if [ ${nb_restart_file} -gt 1 ] ; then … … 482 482 483 483 eval Path_temp=\${R_OUT_${comp}_R}/${generic_restart_file_name_in} 484 nb_restart_file=$(IGCM_sys_ Nb_files_archive ${Path_temp}_????.nc)485 IGCM_debug_Print 1 "nb_restart_file=${nb_restart_file}" 484 nb_restart_file=$(IGCM_sys_CountFileArchive ${Path_temp}_????.nc) 485 486 486 if [ ${nb_restart_file} -gt 1 ] ; then 487 487 j=0 -
trunk/libIGCM/libIGCM_config/libIGCM_config.ksh
r57 r67 26 26 # Test modipsl tree existence. 27 27 IGCM_sys_TestDir ${MODIPSL} 28 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 28 29 IGCM_sys_TestDir ${libIGCM} 30 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 29 31 IGCM_sys_TestDir ${R_EXE} 32 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 30 33 IGCM_sys_TestDir ${SUBMIT_DIR} 34 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 31 35 32 36 #================================== … … 154 158 # Test Archive input/output. 155 159 IGCM_sys_TestDirArchive ${ARCHIVE} 160 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 156 161 IGCM_sys_TestDirArchive ${R_INIT} 162 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 157 163 IGCM_sys_TestDirArchive ${R_BC} 164 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 158 165 159 166 #==================================================== … … 175 182 fi 176 183 IGCM_sys_TestDirArchive ${R_SAVE} 184 [ $? != 0 ] && IGCM_debug_Exit "IGCM_sys_TestDirArchive" 177 185 178 186 #==================================================== -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_brodie.ksh
r61 r67 148 148 149 149 #D-#================================================== 150 #D-function IGCM_sys_Nb_files_archive151 #D-* Purpose: Count files on Archive filesystem152 #D-* Examples:153 #D-154 function IGCM_sys_Nb_files_archive {155 rsh gaya -n ls ${@} 2>/dev/null | wc -l156 if [ $? -gt 0 ] ; then157 echo "IGCM_sys_RshArchive : erreur."158 fi159 }160 161 #D-#==================================================162 150 #D-function IGCM_sys_RshPost 163 151 #D-* Purpose: Post-process rsh command … … 318 306 echo "IGCM_sys_TestDir :" $@ 319 307 fi 320 if [ ! -d ${1} ]; then 321 echo "IGCM_sys_TestDir : Directory $1 does not exist." 322 IGCM_debug_Exit "IGCM_sys_TestDir" 323 fi 308 typeset ExistFlag 309 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 324 310 IGCM_debug_PopStack "IGCM_sys_TestDir" 311 312 return ${ExistFlag} 325 313 } 326 314 … … 335 323 echo "IGCM_sys_TestDirArchive :" $@ 336 324 fi 337 TEST=$( rsh gaya -n "[ -d $1 ] && echo 1 || echo 0" ) 338 if [ ${TEST} -ne 1 ] ; then 339 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 340 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 341 fi 325 typeset ExistFlag 326 ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" ) 342 327 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 328 329 return ${ExistFlag} 343 330 } 344 331 … … 353 340 echo "IGCM_sys_TestFileArchive :" $@ 354 341 fi 355 typeset RET 356 357 mfls ${1} | grep ${1} > /dev/null 2>&1 358 RET=$? 359 if [ ${RET} -gt 0 ]; then 360 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 361 return 1 362 else 363 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 364 return 0 365 fi 342 typeset ExistFlag 343 ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" ) 344 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 345 346 return ${ExistFlag} 347 } 348 349 #D-#================================================== 350 #D-function IGCM_sys_CountFileArchive 351 #D-* Purpose: Count files on Archive filesystem 352 #D-* Examples: 353 #D- 354 function IGCM_sys_CountFileArchive { 355 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 356 IGCM_sys_RshArchive "ls ${@} 2>/dev/null | wc -l" 357 if [ $? -gt 0 ] ; then 358 echo "IGCM_sys_CountFileArchive : erreur." 359 fi 360 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 366 361 } 367 362 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_calculo.ksh
r61 r67 174 174 175 175 #D-#================================================== 176 #D-function IGCM_sys_Nb_files_archive177 #D-* Purpose: Count files on Archive filesystem178 #D-* Examples:179 #D-180 function IGCM_sys_Nb_files_archive {181 ls ${@} 2>/dev/null | wc -l182 if [ $? -gt 0 ] ; then183 echo "IGCM_sys_RshArchive : erreur."184 fi185 }186 187 #D-#==================================================188 176 #D-function IGCM_sys_RshPost 189 177 #D-* Purpose: Master rsh command … … 353 341 echo "IGCM_sys_TestDir :" $@ 354 342 fi 355 if [ ! -d ${1} ]; then 356 echo "IGCM_sys_TestDir : Directory $1 does not exist." 357 IGCM_debug_Exit "IGCM_sys_TestDir" 358 fi 343 typeset ExistFlag 344 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 359 345 IGCM_debug_PopStack "IGCM_sys_TestDir" 346 347 return ${ExistFlag} 360 348 } 361 349 … … 370 358 echo "IGCM_sys_TestDirArchive :" $@ 371 359 fi 372 if [ ! -d ${1} ]; then 373 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 374 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 375 fi 360 typeset ExistFlag 361 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 376 362 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 363 364 return ${ExistFlag} 377 365 } 378 366 … … 387 375 echo "IGCM_sys_TestFileArchive :" $@ 388 376 fi 389 if [ ! -f ${1} ]; then 390 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 391 return 1 392 else 393 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 394 return 0 395 fi 377 typeset ExistFlag 378 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 379 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 380 381 return ${ExistFlag} 382 } 383 384 #D-#================================================== 385 #D-function IGCM_sys_CountFileArchive 386 #D-* Purpose: Count files on Archive filesystem 387 #D-* Examples: 388 #D- 389 function IGCM_sys_CountFileArchive { 390 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 391 ls ${@} 2>/dev/null | wc -l 392 if [ $? -gt 0 ] ; then 393 echo "IGCM_sys_CountFileArchive : erreur." 394 fi 395 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 396 396 } 397 397 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_claude.ksh
r61 r67 190 190 191 191 #D-#================================================== 192 #D-function IGCM_sys_Nb_files_archive193 #D-* Purpose: Count files on Archive filesystem194 #D-* Examples:195 #D-196 function IGCM_sys_Nb_files_archive {197 ls ${@} 2>/dev/null | wc -l198 if [ $? -gt 0 ] ; then199 echo "IGCM_sys_RshArchive : erreur."200 fi201 }202 203 #D-#==================================================204 192 #D-function IGCM_sys_RshPost 205 193 #D-* Purpose: Master rsh command … … 369 357 echo "IGCM_sys_TestDir :" $@ 370 358 fi 371 if [ ! -d ${1} ]; then 372 echo "IGCM_sys_TestDir : Directory $1 does not exist." 373 IGCM_debug_Exit "IGCM_sys_TestDir" 374 fi 359 typeset ExistFlag 360 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 375 361 IGCM_debug_PopStack "IGCM_sys_TestDir" 362 363 return ${ExistFlag} 376 364 } 377 365 … … 386 374 echo "IGCM_sys_TestDirArchive :" $@ 387 375 fi 388 if [ ! -d ${1} ]; then 389 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 390 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 391 fi 376 typeset ExistFlag 377 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 392 378 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 379 380 return ${ExistFlag} 393 381 } 394 382 … … 403 391 echo "IGCM_sys_TestFileArchive :" $@ 404 392 fi 405 if [ ! -f ${1} ]; then 406 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 407 return 1 408 else 409 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 410 return 0 411 fi 393 typeset ExistFlag 394 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 395 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 396 397 return ${ExistFlag} 398 } 399 400 #D-#================================================== 401 #D-function IGCM_sys_CountFileArchive 402 #D-* Purpose: Count files on Archive filesystem 403 #D-* Examples: 404 #D- 405 function IGCM_sys_CountFileArchive { 406 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 407 ls ${@} 2>/dev/null | wc -l 408 if [ $? -gt 0 ] ; then 409 echo "IGCM_sys_CountFileArchive : erreur." 410 fi 411 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 412 412 } 413 413 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_default.ksh
r61 r67 175 175 176 176 #D-#================================================== 177 #D-function IGCM_sys_Nb_files_archive178 #D-* Purpose: Count files on Archive filesystem179 #D-* Examples:180 #D-181 function IGCM_sys_Nb_files_archive {182 ls ${@} 2>/dev/null | wc -l183 if [ $? -gt 0 ] ; then184 echo "IGCM_sys_RshArchive : erreur."185 fi186 }187 188 #D-#==================================================189 177 #D-function IGCM_sys_RshPost 190 178 #D-* Purpose: Master rsh command … … 354 342 echo "IGCM_sys_TestDir :" $@ 355 343 fi 356 if [ ! -d ${1} ]; then 357 echo "IGCM_sys_TestDir : Directory $1 does not exist." 358 IGCM_debug_Exit "IGCM_sys_TestDir" 359 fi 344 typeset ExistFlag 345 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 360 346 IGCM_debug_PopStack "IGCM_sys_TestDir" 347 348 return ${ExistFlag} 361 349 } 362 350 … … 371 359 echo "IGCM_sys_TestDirArchive :" $@ 372 360 fi 373 if [ ! -d ${1} ]; then 374 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 375 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 376 fi 361 typeset ExistFlag 362 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 377 363 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 364 365 return ${ExistFlag} 378 366 } 379 367 … … 388 376 echo "IGCM_sys_TestFileArchive :" $@ 389 377 fi 390 if [ ! -f ${1} ]; then 391 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 392 return 1 393 else 394 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 395 return 0 396 fi 378 typeset ExistFlag 379 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 380 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 381 382 return ${ExistFlag} 383 } 384 385 #D-#================================================== 386 #D-function IGCM_sys_CountFileArchive 387 #D-* Purpose: Count files on Archive filesystem 388 #D-* Examples: 389 #D- 390 function IGCM_sys_CountFileArchive { 391 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 392 ls ${@} 2>/dev/null | wc -l 393 if [ $? -gt 0 ] ; then 394 echo "IGCM_sys_CountFileArchive : erreur." 395 fi 396 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 397 397 } 398 398 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercure.ksh
r61 r67 147 147 148 148 #D-#================================================== 149 #D-function IGCM_sys_Nb_files_archive150 #D-* Purpose: Count files on Archive filesystem151 #D-* Examples:152 #D-153 function IGCM_sys_Nb_files_archive {154 ls ${@} 2>/dev/null | wc -l155 if [ $? -gt 0 ] ; then156 echo "IGCM_sys_RshArchive : erreur."157 fi158 }159 160 #D-#==================================================161 149 #D-function IGCM_sys_RshPost 162 150 #D-* Purpose: Post-process rsh command … … 323 311 echo "IGCM_sys_TestDir :" $@ 324 312 fi 325 if [ ! -d ${1} ]; then 326 echo "IGCM_sys_TestDir : Directory $1 does not exist." 327 IGCM_debug_Exit "IGCM_sys_TestDir" 328 fi 313 typeset ExistFlag 314 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 329 315 IGCM_debug_PopStack "IGCM_sys_TestDir" 316 317 return ${ExistFlag} 330 318 } 331 319 … … 340 328 echo "IGCM_sys_TestDirArchive :" $@ 341 329 fi 342 if [ ! -d ${1} ]; then 343 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 344 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 345 fi 330 typeset ExistFlag 331 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 346 332 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 333 334 return ${ExistFlag} 347 335 } 348 336 … … 357 345 echo "IGCM_sys_TestFileArchive :" $@ 358 346 fi 359 if [ ! -f ${1} ]; then 360 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 361 return 1 362 else 363 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 364 return 0 365 fi 347 typeset ExistFlag 348 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 349 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 350 351 return ${ExistFlag} 352 } 353 354 #D-#================================================== 355 #D-function IGCM_sys_CountFileArchive 356 #D-* Purpose: Count files on Archive filesystem 357 #D-* Examples: 358 #D- 359 function IGCM_sys_CountFileArchive { 360 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 361 ls ${@} 2>/dev/null | wc -l 362 if [ $? -gt 0 ] ; then 363 echo "IGCM_sys_CountFileArchive : erreur." 364 fi 365 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 366 366 } 367 367 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercureTX.ksh
r61 r67 182 182 183 183 #D-#================================================== 184 #D-function IGCM_sys_Nb_files_archive185 #D-* Purpose: Count files on Archive filesystem186 #D-* Examples:187 #D-188 function IGCM_sys_Nb_files_archive {189 ls ${@} 2>/dev/null | wc -l190 if [ $? -gt 0 ] ; then191 echo "IGCM_sys_RshArchive : erreur."192 fi193 }194 195 #D-#==================================================196 184 #D-function IGCM_sys_RshPost 197 185 #D-* Purpose: Master rsh command … … 358 346 echo "IGCM_sys_TestDir :" $@ 359 347 fi 360 if [ ! -d ${1} ]; then 361 echo "IGCM_sys_TestDir : Directory $1 does not exist." 362 IGCM_debug_Exit "IGCM_sys_TestDir" 363 fi 348 typeset ExistFlag 349 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 364 350 IGCM_debug_PopStack "IGCM_sys_TestDir" 351 352 return ${ExistFlag} 365 353 } 366 354 … … 375 363 echo "IGCM_sys_TestDirArchive :" $@ 376 364 fi 377 if [ ! -d ${1} ]; then 378 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 379 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 380 fi 365 typeset ExistFlag 366 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 381 367 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 368 369 return ${ExistFlag} 382 370 } 383 371 … … 392 380 echo "IGCM_sys_TestFileArchive :" $@ 393 381 fi 394 if [ ! -f ${1} ]; then 395 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 396 return 1 397 else 398 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 399 return 0 400 fi 382 typeset ExistFlag 383 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 384 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 385 386 return ${ExistFlag} 387 } 388 389 #D-#================================================== 390 #D-function IGCM_sys_CountFileArchive 391 #D-* Purpose: Count files on Archive filesystem 392 #D-* Examples: 393 #D- 394 function IGCM_sys_CountFileArchive { 395 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 396 ls ${@} 2>/dev/null | wc -l 397 if [ $? -gt 0 ] ; then 398 echo "IGCM_sys_CountFileArchive : erreur." 399 fi 400 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 401 401 } 402 402 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_obelix.ksh
r61 r67 175 175 176 176 #D-#================================================== 177 #D-function IGCM_sys_Nb_files_archive178 #D-* Purpose: Count files on Archive filesystem179 #D-* Examples:180 #D-181 function IGCM_sys_Nb_files_archive {182 ls ${@} 2>/dev/null | wc -l183 if [ $? -gt 0 ] ; then184 echo "IGCM_sys_RshArchive : erreur."185 fi186 }187 188 #D-#==================================================189 177 #D-function IGCM_sys_RshPost 190 178 #D-* Purpose: Master rsh command … … 354 342 echo "IGCM_sys_TestDir :" $@ 355 343 fi 356 if [ ! -d ${1} ]; then 357 echo "IGCM_sys_TestDir : Directory $1 does not exist." 358 IGCM_debug_Exit "IGCM_sys_TestDir" 359 fi 344 typeset ExistFlag 345 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 360 346 IGCM_debug_PopStack "IGCM_sys_TestDir" 347 348 return ${ExistFlag} 361 349 } 362 350 … … 371 359 echo "IGCM_sys_TestDirArchive :" $@ 372 360 fi 373 if [ ! -d ${1} ]; then 374 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 375 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 376 fi 361 typeset ExistFlag 362 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 377 363 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 364 365 return ${ExistFlag} 378 366 } 379 367 … … 388 376 echo "IGCM_sys_TestFileArchive :" $@ 389 377 fi 390 if [ ! -f ${1} ]; then 391 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 392 return 1 393 else 394 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 395 return 0 396 fi 378 typeset ExistFlag 379 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 380 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 381 382 return ${ExistFlag} 383 } 384 385 #D-#================================================== 386 #D-function IGCM_sys_CountFileArchive 387 #D-* Purpose: Count files on Archive filesystem 388 #D-* Examples: 389 #D- 390 function IGCM_sys_CountFileArchive { 391 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 392 ls ${@} 2>/dev/null | wc -l 393 if [ $? -gt 0 ] ; then 394 echo "IGCM_sys_CountFileArchive : erreur." 395 fi 396 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 397 397 } 398 398 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_platine.ksh
r61 r67 193 193 194 194 #D-#================================================== 195 #D-function IGCM_sys_Nb_files_archive196 #D-* Purpose: Count files on Archive filesystem197 #D-* Examples:198 #D-199 function IGCM_sys_Nb_files_archive {200 ls ${@} 2>/dev/null | wc -l201 if [ $? -gt 0 ] ; then202 echo "IGCM_sys_RshArchive : erreur."203 fi204 }205 206 #D-#==================================================207 195 #D-function IGCM_sys_RshPost 208 196 #D-* Purpose: Post-process rsh command … … 369 357 echo "IGCM_sys_TestDir :" $@ 370 358 fi 371 if [ ! -d ${1} ]; then 372 echo "IGCM_sys_TestDir : Directory $1 does not exist." 373 IGCM_debug_Exit "IGCM_sys_TestDir" 374 fi 359 typeset ExistFlag 360 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 375 361 IGCM_debug_PopStack "IGCM_sys_TestDir" 362 363 return ${ExistFlag} 376 364 } 377 365 … … 386 374 echo "IGCM_sys_TestDirArchive :" $@ 387 375 fi 388 if [ ! -d ${1} ]; then 389 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 390 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 391 fi 376 typeset ExistFlag 377 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 392 378 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 379 380 return ${ExistFlag} 393 381 } 394 382 … … 400 388 function IGCM_sys_TestFileArchive { 401 389 IGCM_debug_PushStack "IGCM_sys_TestFileArchive" $@ 402 if ( $DEBUG_sys ) ; then 403 echo "IGCM_sys_TestFileArchive :" $@ 404 fi 405 if [ ! -f ${1} ]; then 406 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 407 return 1 408 else 409 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 410 return 0 411 fi 390 typeset ExistFlag 391 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 392 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 393 394 return ${ExistFlag} 395 } 396 397 #D-#================================================== 398 #D-function IGCM_sys_CountFileArchive 399 #D-* Purpose: Count files on Archive filesystem 400 #D-* Examples: 401 #D- 402 function IGCM_sys_CountFileArchive { 403 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 404 if ( $DEBUG_sys ) ; then 405 echo "IGCM_sys_CountFileArchive :" $@ 406 fi 407 ls ${@} 2>/dev/null | wc -l 408 if [ $? -gt 0 ] ; then 409 echo "IGCM_sys_CountFileArchive : erreur." 410 fi 411 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 412 412 } 413 413 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_rhodes.ksh
r61 r67 169 169 170 170 #D-#================================================== 171 #D-function IGCM_sys_Nb_files_archive172 #D-* Purpose: Count files on Archive filesystem173 #D-* Examples:174 #D-175 function IGCM_sys_Nb_files_archive {176 ls ${@} 2>/dev/null | wc -l177 if [ $? -gt 0 ] ; then178 echo "IGCM_sys_RshArchive : erreur."179 fi180 }181 182 #D-#==================================================183 171 #D-function IGCM_sys_RshPost 184 172 #D-* Purpose: Master rsh command … … 345 333 echo "IGCM_sys_TestDir :" $@ 346 334 fi 347 if [ ! -d ${1} ]; then 348 echo "IGCM_sys_TestDir : Directory $1 does not exist." 349 IGCM_debug_Exit "IGCM_sys_TestDir" 350 fi 335 typeset ExistFlag 336 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 351 337 IGCM_debug_PopStack "IGCM_sys_TestDir" 338 339 return ${ExistFlag} 352 340 } 353 341 … … 362 350 echo "IGCM_sys_TestDirArchive :" $@ 363 351 fi 364 if [ ! -d ${1} ]; then 365 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 366 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 367 fi 352 typeset ExistFlag 353 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 368 354 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 355 356 return ${ExistFlag} 369 357 } 370 358 … … 379 367 echo "IGCM_sys_TestFileArchive :" $@ 380 368 fi 381 typeset RET 382 383 mfls ${1} | grep ${1} > /dev/null 2>&1 384 RET=$? 385 if [ ${RET} -gt 0 ]; then 386 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 387 return 1 388 else 389 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 390 return 0 391 fi 369 typeset ExistFlag 370 ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 ) 371 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 372 373 return ${ExistFlag} 374 } 375 376 #D-#================================================== 377 #D-function IGCM_sys_CountFileArchive 378 #D-* Purpose: Count files on Archive filesystem 379 #D-* Examples: 380 #D- 381 function IGCM_sys_CountFileArchive { 382 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 383 ls ${@} 2>/dev/null | wc -l 384 if [ $? -gt 0 ] ; then 385 echo "IGCM_sys_CountFileArchive : erreur." 386 fi 387 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 392 388 } 393 389 -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_ulam.ksh
r65 r67 177 177 178 178 #D-#================================================== 179 #D-function IGCM_sys_Nb_files_archive180 #D-* Purpose: Count files on Archive filesystem181 #D-* Examples:182 #D-183 function IGCM_sys_Nb_files_archive {184 ls ${@} 2>/dev/null | wc -l185 if [ $? -gt 0 ] ; then186 echo "IGCM_sys_RshArchive : erreur."187 fi188 }189 190 #D-#==================================================191 179 #D-function IGCM_sys_RshPost 192 180 #D-* Purpose: Master rsh command … … 353 341 echo "IGCM_sys_TestDir :" $@ 354 342 fi 355 if [ ! -d ${1} ]; then 356 echo "IGCM_sys_TestDir : Directory $1 does not exist." 357 IGCM_debug_Exit "IGCM_sys_TestDir" 358 fi 343 typeset ExistFlag 344 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 359 345 IGCM_debug_PopStack "IGCM_sys_TestDir" 346 347 return ${ExistFlag} 348 # if [ ! -d ${1} ]; then 349 # echo "IGCM_sys_TestDir : Directory $1 does not exist." 350 # IGCM_debug_Exit "IGCM_sys_TestDir" 351 # fi 360 352 } 361 353 … … 370 362 echo "IGCM_sys_TestDirArchive :" $@ 371 363 fi 372 if [ ! -d ${1} ]; then 373 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 374 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 375 fi 364 typeset ExistFlag 365 ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" ) 376 366 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 367 368 return ${ExistFlag} 369 # if [ ! -d ${1} ]; then 370 # echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 371 # IGCM_debug_Exit "IGCM_sys_TestDirArchive" 372 # fi 377 373 } 378 374 … … 387 383 echo "IGCM_sys_TestFileArchive :" $@ 388 384 fi 389 typeset RET 390 391 mfls ${1} | grep ${1} > /dev/null 2>&1 392 RET=$? 393 if [ ${RET} -gt 0 ]; then 394 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 395 return 1 396 else 397 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 398 return 0 399 fi 385 typeset ExistFlag 386 ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" ) 387 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 388 389 return ${ExistFlag} 390 } 391 392 #D-#================================================== 393 #D-function IGCM_sys_CountFileArchive 394 #D-* Purpose: Count files on Archive filesystem 395 #D-* Examples: 396 #D- 397 function IGCM_sys_CountFileArchive { 398 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 399 IGCM_sys_RshArchive "ls ${@} 2>/dev/null | wc -l" 400 if [ $? -gt 0 ] ; then 401 echo "IGCM_sys_CountFileArchive : erreur." 402 fi 403 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 400 404 } 401 405 … … 911 915 fi 912 916 if [ $DRYRUN = 0 ]; then 913 if [ ! -d ${R_SAVE}/${1} ] ; then 917 IGCM_sys_TestDirArchive ${R_SAVE}/${1} 918 if [ $? != 0 ] ; then 914 919 echo "WARNING : IGCM_sys_Put_Dods ${R_SAVE}/${1} DOES NOT EXIST ." 915 920 IGCM_debug_PopStack "IGCM_sys_Put_Dods" -
trunk/libIGCM/libIGCM_sys/libIGCM_sys_zahir.ksh
r61 r67 148 148 149 149 #D-#================================================== 150 #D-function IGCM_sys_Nb_files_archive151 #D-* Purpose: Count files on Archive filesystem152 #D-* Examples:153 #D-154 function IGCM_sys_Nb_files_archive {155 ls ${@} 2>/dev/null | wc -l156 if [ $? -gt 0 ] ; then157 echo "IGCM_sys_RshArchive : erreur."158 fi159 }160 161 #D-#==================================================162 150 #D-function IGCM_sys_RshPost 163 151 #D-* Purpose: Master rsh command … … 318 306 echo "IGCM_sys_TestDir :" $@ 319 307 fi 320 if [ ! -d ${1} ]; then 321 echo "IGCM_sys_TestDir : Directory $1 does not exist." 322 IGCM_debug_Exit "IGCM_sys_TestDir" 323 fi 308 typeset ExistFlag 309 ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 ) 324 310 IGCM_debug_PopStack "IGCM_sys_TestDir" 311 312 return ${ExistFlag} 325 313 } 326 314 … … 335 323 echo "IGCM_sys_TestDirArchive :" $@ 336 324 fi 337 TEST=$( rsh gaya -n "[ -d $1 ] && echo 1 || echo 0" ) 338 if [ ${TEST} -ne 1 ] ; then 339 echo "IGCM_sys_TestDirArchive : Directory $1 does not exist on ${ARCHIVE}." 340 IGCM_debug_Exit "IGCM_sys_TestDirArchive" 341 fi 325 typeset ExistFlag 326 ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" ) 342 327 IGCM_debug_PopStack "IGCM_sys_TestDirArchive" 328 329 return ${ExistFlag} 343 330 } 344 331 … … 353 340 echo "IGCM_sys_TestFileArchive :" $@ 354 341 fi 355 typeset RET 356 357 mfls ${1} | grep ${1} > /dev/null 2>&1 358 RET=$? 359 if [ ${RET} -gt 0 ]; then 360 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 361 return 1 362 else 363 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 364 return 0 365 fi 342 typeset ExistFlag 343 ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" ) 344 IGCM_debug_PopStack "IGCM_sys_TestFileArchive" 345 346 return ${ExistFlag} 347 } 348 349 #D-#================================================== 350 #D-function IGCM_sys_CountFileArchive 351 #D-* Purpose: Count files on Archive filesystem 352 #D-* Examples: 353 #D- 354 function IGCM_sys_CountFileArchive { 355 IGCM_debug_PushStack "IGCM_sys_CountFileArchive" $@ 356 IGCM_sys_RshArchive "ls ${@} 2>/dev/null | wc -l" 357 if [ $? -gt 0 ] ; then 358 echo "IGCM_sys_CountFileArchive : erreur." 359 fi 360 IGCM_debug_PopStack "IGCM_sys_CountFileArchive" 366 361 } 367 362
Note: See TracChangeset
for help on using the changeset viewer.