Skip to content

Commit c944bef

Browse files
committed
Merge branch '575-job-failed-360568' into 'development'
Resolve "Job Failed #360568" Closes #575 See merge request damask/DAMASK!1153
2 parents 725a9cd + 01a3b0b commit c944bef

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

src/CLI.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ cout << endl;
211211
#endif
212212

213213
cout << " Version: " << DAMASK_VERSION << std::endl << std::endl;
214-
cout << " Compiled with: ";
214+
cout << " Compiled with:";
215215
#if defined(__clang__)
216216
cout << " Clang version " << __clang_major__ << "." << __clang_minor__ << "."
217217
<< __clang_patchlevel__ << std::endl;
@@ -223,6 +223,7 @@ cout << endl;
223223
<< __INTEL_COMPILER_UPDATE << std::endl;
224224
#endif
225225
F_printCompileOptions();
226+
cout << std::endl;
226227
cout << " PETSc version: " << PETSC_VERSION_MAJOR << "."
227228
<< PETSC_VERSION_MINOR << "."
228229
<< PETSC_VERSION_SUBMINOR << std::endl << std::endl;

src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ foreach(VARIANT GRID MESH TEST)
2020
if(Boost_FOUND)
2121
target_link_libraries(damask_c_${VARIANT} PUBLIC Boost::program_options)
2222
target_compile_definitions(damask_c_${VARIANT} PUBLIC BOOST)
23+
add_compile_definitions(BOOST)
2324
endif()
2425
target_link_libraries(${executable_name} PRIVATE damask_c_${VARIANT})
2526
install(TARGETS ${executable_name} RUNTIME DESTINATION bin)

src/IO.f90

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -877,6 +877,7 @@ subroutine IO_printCppString(C_STR) bind(C, name='F_IO_printCppString')
877877

878878

879879
write (IO_STDOUT, '(a)', advance='no') c_f_string(c_str)
880+
flush(IO_STDOUT)
880881

881882
end subroutine IO_printCppString
882883
#endif

0 commit comments

Comments
 (0)