diff --git a/couplage/MAR_n5 b/couplage/MAR_n5 index 8bfc075d120a96d99a2d29c576821f5b6173f62f..377d94aaa314fa3573f20f5831035f7a9ca0359f 100644 --- a/couplage/MAR_n5 +++ b/couplage/MAR_n5 @@ -1082,7 +1082,7 @@ echo "job command file < MAR*.DAT input data files" #caraib input files -yl= $(($yr - 1)) +yl=$((yr - 1)) CARfil=$STKmar/$domain/ CARcou="CARAIB_couplage.tar.gz" @@ -1090,20 +1090,16 @@ CARfilres=$STKmar/$domain/CARAIB_couplage/results/Belgium BCH "echo \" $CARfil \${WRKdir}\ \"" -BCH "if [ ! -f \"$WRKtmp/$CARcou\" ] ; then" -BCH " smget \"$CARfil\" \"$CARcou\" \"\${WRKdir}\"" -BCH " tar -xzf \"\${WRKdir}\"/\"$CARcou\"" -BCH " rm -rf \${WRKdir}/CARAIB_couplage.tar.gz" -BCH "else" -BCH " tar -xzf \"\${WRKdir}\"/\"$CARcou\"" -BCH " rm -rf \${WRKdir}/CARAIB_couplage.tar.gz" -BCH "fi" - +BCH " " +BCH "smget \"$CARfil\" \"$CARcou\" \"\${WRKdir}\"" +BCH "tar -xzf \"\${WRKdir}\"/\"$CARcou\"" +BCH "rm -rf \${WRKdir}/CARAIB_couplage.tar.gz" +BCH " " BCH "rm -rf \${WRKdir}/CARAIB_couplage/results/Belgium/*" - -BCH " for fil in \`ls \${CARfilres}/*\${yl}*\` ; do" -BCH " smput \"\$CARfilres/\" \"\$fil\" \"\${WRKdir}/CARAIB_couplage/results/Belgium/\"" -BCH " done" +BCH " " +BCH "for fil in \`ls \${CARfilres}/*"${yl}"*\` ; do" +BCH " smput \"\$CARfilres/\" \"\$fil\" \"\${WRKdir}/CARAIB_couplage/results/Belgium/\"" +BCH "done" echo "job command file < CARAIB input data files" @@ -1312,10 +1308,6 @@ echo "job command file < MARctr.dat input data file" #--------------------------------------- BCHt "Stock initialisation" -BCH "#creating CAR folders" -BCH "mkdir -p $STKmar/$domain/$runnam/caraib" -BCH "mkdir -p $STKmar/$domain/$runnam/caraib/$yr" - #creating needed directory on stock if [ -z ${FTPout} ] ; then case $cluster in @@ -1326,6 +1318,10 @@ BCH "mkdir -p $STKmar/$domain/crash" BCH "mkdir -p $STKmar/$domain/$runnam/log" BCH "mkdir -p $STKmar/$domain/$runnam/$yr" BCH "mkdir -p $STKmar/$domain/input/MARsim/$runnam/$yrN" + +BCH "#creating CAR folders" +BCH "mkdir -p $STKmar/$domain/$runnam/caraib" +BCH "mkdir -p $STKmar/$domain/$runnam/caraib/$yr" fi ;; (foehn|froggy) @@ -1343,7 +1339,7 @@ fi STKcrash=$STKmar/$domain/crash STKlog=$STKmar/$domain/$runnam/log -STKout=$STKmar/$domain/$runnam/$yr +STKout=$STKmar/$domain/$runnam/mar/$yr STKsim=$STKmar/$domain/input/MARsim/$runnam/$yrN STKcar=$STKmar/$domain/$runnam/caraib/$yr