diff --git a/src/config/32_to_64 b/src/config/32_to_64 index 8551259612..622cc44766 100755 --- a/src/config/32_to_64 +++ b/src/config/32_to_64 @@ -1,55 +1,43 @@ -#!/bin/csh -f +#!/bin/bash -f # # $Id$ # - -@ useperl = 1 - -if ($useperl) then - - if (-x /msrc/apps/bin/perl) then - set perlexe = /msrc/apps/bin/perl - else if (-x /usr/local/bin/perl) then - set perlexe = /usr/local/bin/perl - else if (-x /usr/local/gnu/bin/perl) then - set perlexe = /usr/local/gnu/bin/perl - else if (-x /usr/gnu/bin/perl) then - set perlexe = /usr/gnu/bin/perl +# +# modified to use the perl version to change back to the sed scripts +# + if [ -x /msrc/apps/bin/perl ]; then + perlexe=/msrc/apps/bin/perl + elif [ -x /usr/local/bin/perl ]; then + perlexe=/usr/local/bin/perl + elif [ -x /usr/local/gnu/bin/perl ]; then + perlexe=/usr/local/gnu/bin/perl + elif [ -x /usr/gnu/bin/perl ]; then + perlexe=/usr/gnu/bin/perl else # assume perl is in your path - set perlexe = perl - endif - set perlscript = {$NWCHEM_TOP}/src/config/32_to_64.pl + perlexe=perl + fi + perlscript=${NWCHEM_TOP}/src/config/32_to_64.pl -else - echo "should not be here"; - exit 1; + JOB_LIMIT=4 -set sufx = .dbl + njob=0 -endif +for file in "$@" +do -set JOB_LIMIT = 4 + echo converting "$file" to 32-bit integers for BLAS/LAPACK + ($perlexe $perlscript $file) & -@ njob = 0 - -foreach file ($argv) - - echo converting $file back to 8-byte integer blas calls - if ($useperl) then - ($perlexe $perlscript $file) & - else - (sed -f $sed_script < $file > {$file}{$sufx} && mv -f {$file}{$sufx} $file;\ - sed -f $sed_script2 < $file > {$file}{$sufx} && mv -f {$file}{$sufx} $file)& - endif - - @ njob ++ - if ($njob >= $JOB_LIMIT) then + let njob++ + if [ $njob -gt $JOB_LIMIT ]; then wait - @ njob = 0 - endif + let njob=0 + fi -end +done -if ($njob > 0) wait +if [ $njob -gt 0 ] ; then + wait +fi diff --git a/src/config/64_to_32 b/src/config/64_to_32 index 7098ea5102..97a864ef31 100755 --- a/src/config/64_to_32 +++ b/src/config/64_to_32 @@ -1,55 +1,43 @@ -#!/bin/csh -f +#!/bin/bash -f # # $Id$ # # # modified to use the perl version to change back to the sed scripts -# reset useperl = 0 # -@ useperl = 1 - -if ($useperl) then - - if (-x /msrc/apps/bin/perl) then - set perlexe = /msrc/apps/bin/perl - else if (-x /usr/local/bin/perl) then - set perlexe = /usr/local/bin/perl - else if (-x /usr/local/gnu/bin/perl) then - set perlexe = /usr/local/gnu/bin/perl - else if (-x /usr/gnu/bin/perl) then - set perlexe = /usr/gnu/bin/perl + if [ -x /msrc/apps/bin/perl ]; then + perlexe=/msrc/apps/bin/perl + elif [ -x /usr/local/bin/perl ]; then + perlexe=/usr/local/bin/perl + elif [ -x /usr/local/gnu/bin/perl ]; then + perlexe=/usr/local/gnu/bin/perl + elif [ -x /usr/gnu/bin/perl ]; then + perlexe=/usr/gnu/bin/perl else # assume perl is in your path - set perlexe = perl - endif - set perlscript = {$NWCHEM_TOP}/src/config/64_to_32.pl + perlexe=perl + fi + perlscript=${NWCHEM_TOP}/src/config/64_to_32.pl -else - echo "shoulkd not be here - exit 1; -endif + JOB_LIMIT=4 -set JOB_LIMIT = 4 + njob=0 -@ njob = 0 +for file in "$@" +do -foreach file ($argv) - - echo converting $file to 32-bit integers for BLAS/LAPACK - if ($useperl) then + echo converting "$file" to 32-bit integers for BLAS/LAPACK ($perlexe $perlscript $file) & - else - (sed -f $sed_script < $file > {$file}{$sufx} && mv -f {$file}{$sufx} $file;\ - sed -f $sed_script2 < $file > {$file}{$sufx} && mv -f {$file}{$sufx} $file)& - endif - @ njob ++ - if ($njob >= $JOB_LIMIT) then + let njob++ + if [ $njob -gt $JOB_LIMIT ]; then wait - @ njob = 0 - endif + let njob=0 + fi -end +done -if ($njob > 0) wait +if [ $njob -gt 0 ] ; then + wait +fi