Changeset 1575

Timestamp:

2009-08-04T10:37:24+02:00 (15 years ago)

Author:

ctlod

Message:

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

File:

• trunk/NVTK/Makefile (modified) (4 diffs)

trunk/NVTK/Makefile

@@ -4 +4 @@
 # Contact : nemo_st@locean-ipsl.upmc.fr
 #
-# VARS TO SET: 9 + 1 (optional)
+# VARS TO SET: 12 + 1 (optional)
 #     - NAM_V             : name of the current test (associated to the same directory name)
 #     - LISTE_CONF        : configurations name (ORCA2_LIM, GYRE ...)
 #     - JOBS_2LAUN        : jobs to launch (nojob, all, long, short or gtime)
 #     - BUILD_MAKE        : run type (mon, mpi ... )
+#     - MPI_I             : i- MPI decomposition
+#     - MPI_J             : j- MPI decomposition
+#     - MPIIJ             : Total number of processors
 #     - MAK_TIME          : to perform a CPU time check use keyword: 'timing' or 'notiming'
 #     - USE_IOMPUT        : use or not the new I/O interface
@@ -41 +44 @@
 BUILD_MAKE = mon mpi
 #-
+#- MPI decomposition
+MPI_I=2
+MPI_J=4
+MPIIJ=8
+#-
 #- Do we use the new io interface (iom_put)? With the io_server? On how many procs?
 USE_IOMPUT = false
@@ -74 +82 @@
    @echo "test=" $(NAM_V) > ../$@/specifs.txt
    @echo "runs=" $(BUILD_MAKE) >> ../$@/specifs.txt
+   @echo "mpis=" $(MPI_I) $(MPI_J) $(MPIIJ) >> ../$@/specifs.txt
    @echo "time=" $(MAK_TIME) >> ../$@/specifs.txt
    @echo "memo=" $(MAK_MEMO) >> ../$@/specifs.txt
@@ -95 +104 @@
    @echo
    @echo
-   @gmake -C ../$@ RUN='$(BUILD_MAKE)' JOB=$(JOBS_2LAUN) RTG=$(REF_TAGV) MKTE=$(MAK_TIME) MKMO=$(MAK_MEMO) REXP=$(NAM_V) USE_IOMPUT=$(USE_IOMPUT) USE_IOSERVER=$(USE_IOSERVER) NB_PROCS_IOSERVER=$(NB_PROCS_IOSERVER) -j 2 > $@_step.txt
+   @gmake -C ../$@ RUN='$(BUILD_MAKE)' MPI_I=$(MPI_I) MPI_J=$(MPI_J) MPIIJ=$(MPIIJ) JOB=$(JOBS_2LAUN) RTG=$(REF_TAGV) MKTE=$(MAK_TIME) MKMO=$(MAK_MEMO) REXP=$(NAM_V) USE_IOMPUT=$(USE_IOMPUT) USE_IOSERVER=$(USE_IOSERVER) NB_PROCS_IOSERVER=$(NB_PROCS_IOSERVER) -j 2 > $@_step.txt
 
 #- Rebuild dependencies when new cpp key and/or new module used