Changeset 807

Timestamp:

2008-01-31T16:07:53+01:00 (16 years ago)

Author:

ctlod

Message:

add new variables to allow users to better control compilation and jobs submission, see ticket:#61

Location:

trunk/VALID/2INSTALL

Files:

• CONFIG_FILES/AA_make (modified) (7 diffs)
• CONFIG_FILES/AA_make.ldef (modified) (1 diff)
• JOBS/lance_batch.ksh (modified) (4 diffs)

trunk/VALID/2INSTALL/CONFIG_FILES/AA_make

@@ -12 +12 @@
 
    cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@
+ifneq ($(JOB),nojob)
    cp ../VALID/2INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh
    cp -p ../VALID/2INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh
@@ -29 +30 @@
 #-Q- osxxlf cp ../VALID/2INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh
 #-Q- osxxlf cp ../VALID/2INSTALL/JOBS/BIO_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_osxxlf.ksh
-   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(RTG) ; )
+   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(JOB) $(MKTE) $(RTG) ; )
+endif
 
 omp: mpi
@@ -37 +39 @@
 
    cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@
+ifneq ($(JOB),nojob)
    cp ../VALID/2INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh
    cp -p ../VALID/2INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh
@@ -46 +49 @@
 #-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/MEM_size_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8brodie.ksh
 #-Q- sx8brodie cp ../VALID/2INSTALL/JOBS/BIO_sx8brodie.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_sx8brodie.ksh
-   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(RTG) ; )
+   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(JOB) $(MKTE) $(RTG) ; )
+endif
+
 else
    @echo 'No omp compilation'
@@ -60 +65 @@
 
    cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@
+ifneq ($(JOB),nojob)
    cp ../VALID/2INSTALL/JOBS/job_$(NEMOLIB).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/job_$(NEMOLIB).ksh
    cp -p ../VALID/2INSTALL/JOBS/lance_batch.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/lance_batch.ksh
@@ -77 +83 @@
 #-Q- osxxlf cp ../VALID/2INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh
 #-Q- osxxlf cp ../VALID/2INSTALL/JOBS/BIO_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/BIO_osxxlf.ksh
-   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(RTG) ; )
+   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(JOB) $(MKTE) $(RTG) ; )
+endif
 
 else
@@ -88 +95 @@
 memo:
 #-Q- aix ../../util/ins_make -t ax_mono -w $(NEMOLIB)/WORK
+ifeq ($(MKMO),memo)
+   then 
    gmake -C WORK COMP=$@ clean > $(NEMOLIB)_logbook_$@.txt
    gmake -C WORK COMP=$@ >> $(NEMOLIB)_logbook_$@.txt
 
    cp ../../bin/opa_$(NEMOLIB)_$@  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/opa_$(NEMOLIB)_$@
+else
+   @echo 'No memory check'
+endif
 

trunk/VALID/2INSTALL/CONFIG_FILES/AA_make.ldef

@@ -10 +10 @@
 NEMOLIB := $(shell awk '{ print $$1 }' ./WORK/.config)
 RUN=
+JOB=
 RTG=
 MKTE=
+MKMO=
 WWDIR=/Users/ctlod/WORK/AZE/modipsl/config
 #---------------------------------------------------------------------

trunk/VALID/2INSTALL/JOBS/lance_batch.ksh

@@ -4 +4 @@
 # Contact  : opatlod@locean-ipsl.upmc.fr
 #
-# INPUT ARGS: 2 + 1 optional
+# INPUT ARGS: 3 + 1 optional
 #     - CONF  : configuration name (ORCA2_LIM, GYRE ..)
 #     - MTIME : timing/no timing (timing or notiming)
-#     - REFTAG (optional): reference tag name to which current 
-#              version will be compare to
+#     - JOBTOL: jobs to launch: all, long, 1_short or gtime
+#     - REFTAG: (optional): reference tag name to which current 
+#               version will be compare to
 #
 # WORK: This script aims to (for each standard configuration) :
@@ -65 +66 @@
 CONF=$1
 MTIME=$2
-REFTAG=$3
+JOBTOL=$3
+REFTAG=$4
 RUN=$(basename `pwd`)
 
@@ -178 +180 @@
 dirjob[0]=LONG ; dirjob[1]=1_SHORT ; dirjob[2]=2_SHORT ; dirjob[3]=GTIME 
 
-iloop=3
-if [ ${MTIME} = 'timing' ] ; then iloop=4 ; fi
-
-ind=0
+case ${JOBTOL} in
+     'all' )
+              if [ ${MTIME} = 'timing' ] ; then 
+             ind=0 ; iloop=4 ;
+         else
+             ind=0 ; iloop=3 ;
+              fi ;;
+     'long' )
+              ind=0 ; iloop=1 ;;
+     'short' )
+              ind=1 ; iloop=3 ;;
+     'gtime' )
+              ind=3 ; iloop=4 ;;
+esac
+
 while [ $ind -lt ${iloop} ]
 do
@@ -238 +251 @@
 
        chmod 750 job_${RUN}_${jobnam[$ind]}.ksh
+       mv job_${RUN}_${jobnam[$ind]}.ksh ${dirjob[$ind]}/.
 
        if [ ${jobnam[$ind]} != '2_short' ] ; then
-           mv job_${RUN}_${jobnam[$ind]}.ksh ${dirjob[$ind]}/.
            cd ${dirjob[$ind]}
            ${LAUN}job_${RUN}_${jobnam[$ind]}.ksh &
            cd ../
-       else
-           mv job_${RUN}_${jobnam[$ind]}.ksh ${dirjob[$ind]}/.
        fi