ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into always-exceptions

Browse Source 
# Conflicts:
#	src/library.cpp
This commit is contained in:
Axel Kohlmeyer
2023-08-03 16:46:32 -04:00
parent fc365d3d5f 554db7daaf
commit 4ed98083e0
626 changed files with 8068 additions and 4460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/COUPLE/plugin/liblammpsplugin.h
View File

@ -239,7 +239,7 @@ struct _liblammpsplugin {
void (*free)(void *);
void (*is_running)(void *);
int (*is_running)(void *);
void (*force_timeout)(void *);
int (*has_error)(void *);

2
examples/COUPLE/simple/simple.f90
View File

@ -30,7 +30,7 @@ PROGRAM f_driver
REAL (kind=8), ALLOCATABLE :: x(:)
REAL (kind=8), PARAMETER :: epsilon=0.1
CHARACTER (len=64) :: arg
CHARACTER (len=1024) :: arg
CHARACTER (len=1024) :: line
! setup MPI and various communicators