Changeset 807 for trunk/VALID/2INSTALL/CONFIG_FILES

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/CONFIG_FILES

Files:

• AA_make (modified) (7 diffs)
• AA_make.ldef (modified) (1 diff)

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
 #---------------------------------------------------------------------