Changeset 3885 for BOL/Multi_atlas/Utils/multi.sh

Timestamp:

Apr 30, 2021, 10:38:59 AM (3 years ago)

Author:

musat

Message:

Mise a jour des scripts par rapport a la version fabric
IM

File:

• BOL/Multi_atlas/Utils/multi.sh (modified) (4 diffs)

BOL/Multi_atlas/Utils/multi.sh

@@ -30 +30 @@
 mjo=0
 river=0
-
+dataref=1
+
+ref=OBS
+echo $ref
 # ./job_multi.sh -1D 0 -get 0 -atlas 0 -pcmdi 0 -tuning 0 -lma 0 -trmm 0
 runstxt=$local/runs.txt
@@ -57 +60 @@
       -mjo) mjo=$2 ; shift ;; 
       -river) river=$2 ; shift ;;
+      -dataref) dataref=$2 ; shift ;;
       *) comp=$1 ;;
    esac
@@ -123 +127 @@
 echo listrune= $listrune 
 ls -lrt $MAIN_SE/ORIG
-listsimss="" ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do listsimss="$listsimss $ss" ; done
+#listsimss="" ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do listsimss="$listsimss $ss" ; done
+
+ns=0
+listsimss="" ; 
+for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do  
+if [ $dataref = 0 ] ; then
+   if [ ${ns} = 0 ] ; then
+      ref=$ss
+      echo ref=$ref
+   fi  
+fi
+let "ns = ${ns} + 1"
+listsimss="$listsimss $ss" ; 
+done
+echo ref=$ref
+
 listsimse="" ; for se in `awk ' {print $1"_SE_"$2 } ' $DEF_FILE` ; do listsimse="$listsimse $se" ; done
 echo listsims $listsims
@@ -199 +218 @@
       atlas=${sim}+${seas}+${proj}+$vars
       echo AAAAAAAAAAAAAAAAAAAAAAAA $atlas
-      grep $atlas $COMP_D/ATLAS/atlas_OK
+      #grep $atlas $COMP_D/ATLAS/atlas_OK
       echo BBBBBB
-      if [ "`grep $atlas $COMP_D/ATLAS/atlas_OK`" = "" ] ; then
+      #if [ "`grep $atlas $COMP_D/ATLAS/atlas_OK`" = "" ] ; then
          cd $local/atlas ; pwd ; ls -l atlas.sh
          varg=`echo $vars | sed -e 's/,/+/g'`
          echo Atlas $atlas a creer
          if [ $qsub = 0 ] ; then
-            ./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt
+            #./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt
+            ./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt
          else
-            $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt atlas.sh
+            #$submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt atlas.sh
+            $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt atlas.sh
          fi
-         echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh >> out.com$$
-         echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh
+         #echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh >> out.com$$
+         echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg" atlas.sh >> out.com$$
+         #echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh
+         echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg" atlas.sh
          (( count_atlas = $count_atlas + 1 ))
-      else
-           echo Atlas $atlas existant
-      fi
+      #else
+           #echo Atlas $atlas existant
+      #fi
       (( il = $il + 1 ))
    done