Changeset 1597

Timestamp:

2009-08-11T10:41:33+02:00 (15 years ago)

Author:

ctlod

Message:

NVTK: correct a small bug when using many files into EXP_NAME direcotry, see ticket: #527

File:

• trunk/NVTK/INSTALL/CONFIG_FILES/AA_make (modified) (2 diffs)

trunk/NVTK/INSTALL/CONFIG_FILES/AA_make

@@ -5 +5 @@
 launch: $(RUN) $(MKMO)
 ifneq ($(JOB),nojob)
+   cp    ../NVTK/INSTALL/JOBS/LOBSTER_stat.ksh        $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.
+   cp    ../NVTK/INSTALL/JOBS/PISCES_stat.ksh         $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.
+   cp -p ../NVTK/INSTALL/JOBS/assessment.ksh          $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.
+   cp -p ../NVTK/INSTALL/JOBS/cron_jobs.ksh           $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.
+   cp    ../NVTK/INSTALL/JOBS/CPU_time_$(HPCTAR).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.
+   cp    ../NVTK/INSTALL/JOBS/MEM_size_$(HPCTAR).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.
    @for rtype in `echo $(RUN)` ; do \
    cp    ../NVTK/INSTALL/JOBS/job_$(NEMOLIB).ksh      $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$$rtype/. ; \
    cp    ../NVTK/INSTALL/JOBS/jhd_$(HPCTAR)_$$rtype   $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$$rtype/. ; \
    cp -p ../NVTK/INSTALL/JOBS/lance_batch.ksh         $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$$rtype/. ; \
-   cp    ../NVTK/INSTALL/JOBS/LOBSTER_stat.ksh        $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.         ; \
-   cp    ../NVTK/INSTALL/JOBS/PISCES_stat.ksh         $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.         ; \
-   cp -p ../NVTK/INSTALL/JOBS/assessment.ksh          $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.         ; \
-   cp -p ../NVTK/INSTALL/JOBS/cron_jobs.ksh           $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.         ; \
-   cp    ../NVTK/INSTALL/JOBS/CPU_time_$(HPCTAR).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.         ; \
-   cp    ../NVTK/INSTALL/JOBS/MEM_size_$(HPCTAR).ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/.         ; \
    ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$$rtype/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) \
           $(MPIIJ) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; ) ; \
@@ -24 +24 @@
    @if [ $@ = 'mpi' ] ; then \
    cd MY_SRC ; \
-   grep -h jpni  * | grep -v "*" | head -1 > tmp ; VAR_I=`( cat tmp )` ; rm -f tmp ; \
-   grep -h jpnj  * | grep -v "*" | head -1 > tmp ; VAR_J=`( cat tmp )` ; rm -f tmp ; \
-   grep -h jpnij * | grep -v "*" | head -1 > tmp ; VARIJ=`( cat tmp )` ; rm -f tmp ; \
+   grep -h jpni  par_oce.F90_keep | grep -v "*" | head -1 > tmp ; VAR_I=`( cat tmp )` ; rm -f tmp ; \
+   grep -h jpnj  par_oce.F90_keep | grep -v "*" | head -1 > tmp ; VAR_J=`( cat tmp )` ; rm -f tmp ; \
+   grep -h jpnij par_oce.F90_keep | grep -v "*" | head -1 > tmp ; VARIJ=`( cat tmp )` ; rm -f tmp ; \
    sed -e "s%$$VAR_I%      jpni  = $$MPI_I  , \&%" \
        -e "s%$$VAR_J%      jpnj  = $$MPI_J  , \&%" \