Changeset 1574 for trunk/NVTK/INSTALL/CONFIG_FILES

Timestamp:

2009-08-04T10:35:22+02:00 (15 years ago)

Author:

ctlod

Message:

NVTK: few changes to allow NVTK to manage properly MPI runs, see ticket: #513

Location:

trunk/NVTK/INSTALL/CONFIG_FILES

Files:

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

trunk/NVTK/INSTALL/CONFIG_FILES/AA_make

@@ -34 +34 @@
 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh
 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh
-   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; )
+   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(MPIIJ) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; )
 endif
 
@@ -58 +58 @@
 #-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/CPU_time_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_sx8mercure.ksh
 #-Q- sx8mercure   cp ../NVTK/INSTALL/JOBS/MEM_size_sx8mercure.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_sx8mercure.ksh
-   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; )
+   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(MPIIJ) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; )
 endif
 
@@ -67 +67 @@
 mpi: memo
 ifeq ($(filter mpi,$(RUN)),mpi)
-   cp ./MY_SRC/par_oce.F90_keep ./MY_SRC/par_oce.F90 
+   @( cd MY_SRC ; \
+        grep -h jpni  * | grep -v "*" | head -1 > $$ ; VAR_I=`( cat $$ )` ; rm -f $$ ;\
+        grep -h jpnj  * | grep -v "*" | head -1 > $$ ; VAR_J=`( cat $$ )` ; rm -f $$ ;\
+        grep -h jpnij * | grep -v "*" | head -1 > $$ ; VARIJ=`( cat $$ )` ; rm -f $$ ;\
+        sed -e "s%$$VAR_I%      jpni  = $$MPI_I  , \&%" \
+            -e "s%$$VAR_J%      jpnj  = $$MPI_J  , \&%" \
+            -e "s%$$VARIJ%      jpnij = $$MPIIJ      %" par_oce.F90_keep > par_oce.F90 ; )
    gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) clean > $(NEMOLIB)_logbook_$@.txt
    gmake -C WORK COMP=$@ EXPER=$(REXP) USE_IOMPUT=$(USE_IOMPUT) >> $(NEMOLIB)_logbook_$@.txt
@@ -94 +100 @@
 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/CPU_time_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/CPU_time_osxxlf.ksh
 #-Q- osxxlf cp ../NVTK/INSTALL/JOBS/MEM_size_osxxlf.ksh  $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/MEM_size_osxxlf.ksh
-   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; )
+   ( cd $(WWDIR)/NEMO_VALID/W$(NEMOLIB)/$@/ ; ./lance_batch.ksh $(NEMOLIB) $(MKTE) $(JOB) $(REXP) $(MPIIJ) $(RTG) $(USE_IOMPUT) $(USE_IOSERVER) $(NB_PROCS_IOSERVER) ; )
 endif
 

trunk/NVTK/INSTALL/CONFIG_FILES/AA_make.ldef

@@ -11 +11 @@
 NEMOLIB := $(shell awk '{ print $$1 }' ./WORK/.config)
 RUN=
+MPI_I=
+MPI_J=
+MPIIJ=
 JOB=
 RTG=