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

update LAMMPS GUI bundling for macOS

Browse Source
This commit is contained in:
Axel Kohlmeyer
2023-08-30 06:42:10 -04:00
parent 4f52a5e791
commit 207cb5bb51
5 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
cmake/packaging/LAMMPS_DMG_Background.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 86 KiB

2
cmake/packaging/MacOSXBundleInfo.plist.in
View File

@ -17,7 +17,7 @@
<key>CFBundleLongVersionString</key> <key>CFBundleLongVersionString</key>
<string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string> <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
<key>CFBundleName</key> <key>CFBundleName</key>
<string>LAMMPS</string> <string>LAMMPS_GUI</string>
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>

26
cmake/packaging/README.macos
View File

@ -9,7 +9,7 @@ of the available packages.
The following individual commands are included: The following individual commands are included:
binary2txt lammps-gui lmp msi2lmp phana stl_bin2txt binary2txt lammps-gui lmp msi2lmp phana stl_bin2txt
After copying the lammps-gui folder into your Applications folder, please follow After copying the LAMMPS_GUI folder into your Applications folder, please follow
these steps: these steps:
1. Open the Terminal app 1. Open the Terminal app
@ -23,7 +23,7 @@ these steps:
3. Add the following lines to the end of the file, save it, and close the editor 3. Add the following lines to the end of the file, save it, and close the editor
LAMMPS_INSTALL_DIR=/Applications/LAMMPS.app/Contents LAMMPS_INSTALL_DIR=/Applications/LAMMPS_GUI.app/Contents
LAMMPS_POTENTIALS=${LAMMPS_INSTALL_DIR}/share/lammps/potentials LAMMPS_POTENTIALS=${LAMMPS_INSTALL_DIR}/share/lammps/potentials
LAMMPS_BENCH_DIR=${LAMMPS_INSTALL_DIR}/share/lammps/bench LAMMPS_BENCH_DIR=${LAMMPS_INSTALL_DIR}/share/lammps/bench
MSI2LMP_LIBRARY=${LAMMPS_INSTALL_DIR}/share/lammps/frc_files MSI2LMP_LIBRARY=${LAMMPS_INSTALL_DIR}/share/lammps/frc_files
@ -38,9 +38,9 @@ these steps:
the changes from .zprofile automatically. the changes from .zprofile automatically.
Note: the above assumes you use the default shell (zsh) that comes with Note: the above assumes you use the default shell (zsh) that comes with
MacOS. If you customized MacOS to use a different shell, you'll need to modify MacOS. If you customized MacOS to use a different shell, you'll need to
that shell's init file (.cshrc, .bashrc, etc.) instead with appropiate commands modify that shell's init file (.cshrc, .bashrc, etc.) instead with
to modify the same environment variables. appropiate commands to modify the same environment variables.
5. Try running LAMMPS (which might fail, see step 7) 5. Try running LAMMPS (which might fail, see step 7)
@ -50,10 +50,10 @@ these steps:
lammps-gui ${LAMMPS_BENCH_DIR}/in.rhodo lammps-gui ${LAMMPS_BENCH_DIR}/in.rhodo
Depending on the size and resolution of your screen, the fonts may Depending on the size and resolution of your screen, the fonts may be too
be too small to read. This can be adjusted by setting the environment small to read. This can be adjusted by setting the environment variable
variable QT_FONT_DPI. The default value would be 72, so to increase QT_FONT_DPI. The default value would be 72, so to increase the fonts by a
the fonts by a third one can add to the .zprofile file the line third, one can add to the .zprofile file the line
export QT_FONT_DPI=96 export QT_FONT_DPI=96
@ -61,9 +61,9 @@ these steps:
7. Give permission to execute the commands (lmp, lammps-gui, msi2lmp, binary2txt, phana, stl_bin2txt) 7. Give permission to execute the commands (lmp, lammps-gui, msi2lmp, binary2txt, phana, stl_bin2txt)
MacOS will likely block the initial run of the executables, since they MacOS will likely block the initial run of the executables, since they were
were downloaded from the internet and are missing a known signature from an downloaded from the internet and are missing a known signature from an
identified developer. Go to "Settings" and search for "Security settings". It identified developer. Go to "Settings" and search for "Security settings".
should display a message that an executable like "lmp" was blocked. Press It should display a message that an executable like "lmp" was blocked. Press
"Open anyway", which might prompt you for your admin credentials. Afterwards "Open anyway", which might prompt you for your admin credentials. Afterwards
"lmp" and the other executables should work as expected. "lmp" and the other executables should work as expected.

2
cmake/packaging/build_macos_dmg.sh
View File

@ -75,7 +75,7 @@ echo '
set statusbar visible to false set statusbar visible to false
set toolbar visible to false set toolbar visible to false
set the bounds to { 100, 40, 868, 640 } set the bounds to { 100, 40, 868, 640 }
set position of item "'LAMMPS'.app" to { 190, 216 } set position of item "'LAMMPS_GUI'.app" to { 190, 216 }
set position of item "Applications" to { 576, 216 } set position of item "Applications" to { 576, 216 }
set position of item "README.txt" to { 190, 400 } set position of item "README.txt" to { 190, 400 }
end tell end tell

2
tools/lammps-gui/slideshow.cpp
View File

@ -149,8 +149,6 @@ void SlideShow::loadImage(int idx)
do { do {
QImageReader reader(imagefiles[idx]); QImageReader reader(imagefiles[idx]);
reader.setAutoTransform(true); reader.setAutoTransform(true);
if (!reader.canRead())
fprintf(stderr, "cannot read file %s\n", imagefiles[idx].toStdString().c_str());
const QImage newImage = reader.read(); const QImage newImage = reader.read();
// There was an error reading the image file. Try reading the previous image instead. // There was an error reading the image file. Try reading the previous image instead.