Unverified Commit c3acb3e4 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1361 from akohlmey/collected-small-changes

Collected small changes for the next patch release
parents 4e2ebf7f e62746ef
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ _Briefly describe the new feature(s), enhancement(s), or bugfix(es) included in

**Related Issues**

__If this addresses an open GitHub Issue, mention the issue number here. Use the phrases `fixes #221` or `closes #135`, when you want those issues to be automatically closed when the pull request is merged_
_If this addresses an open GitHub issue for this project, please mention the issue number here, and describe the relation. Use the phrases `fixes #221` or `closes #135`, when you want an issue to be automatically closed when the pull request is merged_

**Author(s)**

@@ -16,7 +16,7 @@ By submitting this pull request, I agree, that my contribution will be included

**Backward Compatibility**

_Please state whether any changes in the pull request break backward compatibility for inputs, and - if yes - explain what has been changed and why_
_Please state whether any changes in the pull request will break backward compatibility for inputs, and - if yes - explain what has been changed and why_

**Implementation Notes**

@@ -24,7 +24,7 @@ _Provide any relevant details about how the changes are implemented, how correct

**Post Submission Checklist**

_Please check the fields below as they are completed **after** the pull request has been submitted_
_Please check the fields below as they are completed **after** the pull request has been submitted. Delete lines that don't apply_

- [ ] The feature or features in this pull request is complete
- [ ] Licensing information is complete
+12 −18
Original line number Diff line number Diff line
@@ -1336,27 +1336,21 @@ set(temp_git_commit "(unknown)")
set(temp_git_branch "(unknown)")
set(temp_git_describe "(unknown)")
set(temp_git_info "false")
if(GIT_FOUND)
  execute_process(COMMAND ${GIT_EXECUTABLE} describe HEAD
    RESULT_VARIABLE temp_in_git_checkout
    ERROR_QUIET
    OUTPUT_STRIP_TRAILING_WHITESPACE)
  if(temp_in_git_checkout EQUAL 0)
if(GIT_FOUND AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../.git)
  set(temp_git_info "true")
    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse HEAD
  execute_process(COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR}/../.git rev-parse HEAD
    OUTPUT_VARIABLE temp_git_commit
    ERROR_QUIET
    OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
  execute_process(COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR}/../.git rev-parse --abbrev-ref HEAD
    OUTPUT_VARIABLE temp_git_branch
    ERROR_QUIET
    OUTPUT_STRIP_TRAILING_WHITESPACE)
    execute_process(COMMAND ${GIT_EXECUTABLE} describe --dirty=-modified
  execute_process(COMMAND ${GIT_EXECUTABLE} -C ${CMAKE_CURRENT_SOURCE_DIR}/../.git describe --dirty=-modified
    OUTPUT_VARIABLE temp_git_describe
    ERROR_QUIET
    OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
endif()

set(temp "${temp}const bool LAMMPS_NS::LAMMPS::has_git_info = ${temp_git_info};\n")
set(temp "${temp}const char LAMMPS_NS::LAMMPS::git_commit[] = \"${temp_git_commit}\";\n")
+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@

/style_*.h
/lmpinstalledpkgs.h
/lmpgitversion.h

/*_gpu.h
/*_gpu.cpp
+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ gitversion:
	@echo 'Gathering git version information'
	@echo '#ifndef LMP_GIT_VERSION_H' >  ${TMPNAME}.lmpgitversion
	@echo '#define LMP_GIT_VERSION_H' >> ${TMPNAME}.lmpgitversion
	@if (type git && git describe HEAD ) >> /dev/null 2>> /dev/null ; then \
	@if (type git && test -e ../.git ) >> /dev/null 2>> /dev/null ; then \
	  git='true';					\
	  commit=$$(git rev-parse HEAD);		\
	  branch=$$(git rev-parse --abbrev-ref HEAD);	\
+5 −0
Original line number Diff line number Diff line
@@ -697,6 +697,11 @@ int FixBocs::read_F_table( char *filename, int p_basis_type )
                                    "of %d in read_F_table",p_basis_type);
    error->all(FLERR,errmsg);
  }
  // cleanup
  for (i = 0; i < N_columns; ++i) {
    free(data[i]);
  }
  free(data);
  return n_entries;
}

Loading