Commit 475e6968 authored by Daniel Wortmann's avatar Daniel Wortmann

Bugfix: Mingeselle only in MPI-case

parent dd2e78bf
...@@ -57,10 +57,12 @@ module m_hsmt_hlptomat ...@@ -57,10 +57,12 @@ module m_hsmt_hlptomat
bb(:size(aahlp)) = bb(:size(aahlp))+bbhlp*chi11 bb(:size(aahlp)) = bb(:size(aahlp))+bbhlp*chi11
bbhlp = conjg(bbhlp)*chi21 bbhlp = conjg(bbhlp)*chi21
ENDIF ENDIF
#ifdef CPP_MPI
CALL mingeselle(SUB_COMM,n_size,n_rank,nv,& CALL mingeselle(SUB_COMM,n_size,n_rank,nv,&
aahlp,.false.,aa_r,aa) aahlp,.false.,aa_r,aa)
IF (present(bb).and.nlotot>1) CALL mingeselle(SUB_COMM,n_size,n_rank,nv,& IF (present(bb).and.nlotot>1) CALL mingeselle(SUB_COMM,n_size,n_rank,nv,&
bbhlp,.false.,bb_r,bb) bbhlp,.false.,bb_r,bb)
#endif
ENDIF ENDIF
end subroutine end subroutine
......
...@@ -565,8 +565,10 @@ CONTAINS ...@@ -565,8 +565,10 @@ CONTAINS
ENDDO ENDDO
ELSE ELSE
#ifdef CPP_MPI
CALL mingeselle(SUB_COMM,n_size,n_rank,lapw%nv, aahlp, .FALSE.,aa_c=aa_c) CALL mingeselle(SUB_COMM,n_size,n_rank,lapw%nv, aahlp, .FALSE.,aa_c=aa_c)
CALL mingeselle(SUB_COMM,n_size,n_rank,lapw%nv, bbhlp, .FALSE.,aa_c=bb_c) CALL mingeselle(SUB_COMM,n_size,n_rank,lapw%nv, bbhlp, .FALSE.,aa_c=bb_c)
#endif
ENDIF ENDIF
ENDIF ENDIF
......
enable_testing() enable_testing()
set(Testdirs CuBulk CuBulkXML Fe_1l Fe_1lXML Fe-Atom CuBand CuBandXML CuDOS CuDOSXML Fe_bct_LO Fe_bct_LOXML Fe_bct Fe_bctXML NiO_ldau NiO_ldauXML PTO PTOXML Fe_fcc Fe_fccXML) set(Testdirs CuBulk CuBulkXML Fe_1l Fe_1lXML Fe-Atom CuBand CuBandXML CuDOS CuDOSXML Fe_bct_LO Fe_bct_LOXML Fe_bct Fe_bctXML NiO_ldau NiO_ldauXML PTO PTOXML Fe_fcc Fe_fccXML Bi2Te3 Bi2Te3XML Fe_1l_SOC Fe_1l_SOCXML PTO-SOC PTO-SOCXML Fe_bct_SOC Fe_bct_SOCXML)
set(Testdirs_INVS CuBulk CuBulkXML Fe_1l Fe_1lXML Fe-Atom CuBand CuBandXML CuDOS CuDOSXML)
set(Testdirs_SOC Bi2Te3 Bi2Te3XML Fe_1l_SOC Fe_1l_SOCXML PTO-SOC PTO-SOCXML Fe_bct_SOC Fe_bct_SOCXML)
#The serial tests #The serial tests
if (${Fleur_uses_serial}) if (${Fleur_uses_serial})
#tests of fleur #tests of fleur
foreach(test ${Testdirs}) foreach(test ${Testdirs})
add_test("FLEUR:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur") add_test("FLEUR:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur")
endforeach(test) endforeach(test)
#test of fleur_INVS
foreach(test ${Testdirs_INVS})
add_test("FLEUR_INVS:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur_INVS")
endforeach(test)
#test of fleur_SOC
foreach(test ${Testdirs_SOC})
add_test("FLEUR_SOC:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur_SOC")
endforeach(test)
endif() endif()
#The parallel tests #The parallel tests
...@@ -26,12 +15,4 @@ if (${Fleur_uses_MPI}) ...@@ -26,12 +15,4 @@ if (${Fleur_uses_MPI})
foreach(test ${Testdirs}) foreach(test ${Testdirs})
add_test("FLEUR_MPI:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur_MPI") add_test("FLEUR_MPI:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur_MPI")
endforeach(test) endforeach(test)
#test of fleur_INVS
foreach(test ${Testdirs_INVS})
add_test("FLEUR_INVS_MPI:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur_INVS_MPI")
endforeach(test)
#test of fleur_SOC
foreach(test ${Testdirs_SOC})
add_test("FLEUR_SOC_MPI:${test}" ${CMAKE_CURRENT_SOURCE_DIR}/tests/test.pl ${test} "${CMAKE_BINARY_DIR}/fleur_SOC_MPI")
endforeach(test)
endif() endif()
...@@ -10,4 +10,4 @@ A) Create the test scripts. Follow for example the files in tests/tests/CuBulk ...@@ -10,4 +10,4 @@ A) Create the test scripts. Follow for example the files in tests/tests/CuBulk
3. in TESTNAME directory create one or more test.run1, test.run2... etc files that will be executed 3. in TESTNAME directory create one or more test.run1, test.run2... etc files that will be executed
4. in TESTNAME/file put files you need 4. in TESTNAME/file put files you need
B) Add the test to tests/CMakeLists.txt again copying an existing example. B) Add the test to tests/CMakeLists.txt by including the testdirectory into the list of tests.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment