Skip to content

Commit

Permalink
Release v0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
imirzov committed Sep 5, 2019
1 parent 67dd73c commit 1edd40f
Show file tree
Hide file tree
Showing 6 changed files with 148 additions and 71 deletions.
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Distributed under GNU General Public License v3.0
- [How to use](#how-to-use)
- [Your help](#your-help)
- [For developers](#for-developers)
- [What's new](#whats-new)
- [TODO](#todo)

<br/><br/>
Expand Down Expand Up @@ -105,6 +106,8 @@ Edit default startup model name in in File->Settings or you can pass it as an ar

To compile CalculiX sources from CAE in Windows you'll need *cygwin* with *gcc*, *gfortran* and *make*. Install it to 'C:\\cygwin64'.

Attention! In Windows CCX may not work if placed outside 'bin' directory. It needs Cygwin DLLs! So, if you change path to CCX, place there Cygwin DLLs from 'bin' directory.

<br/><br/>


Expand Down Expand Up @@ -150,17 +153,19 @@ The source code for the CalculiX solver is taken from the [free_form_fortran pro



# TODO

## Done for the next releasee
# What's new

- Refactored Settings. Fixed path processing.
- New clear source code structure/order.

- New path module to build absolute pathes - reduces amount of mistakes.

- New clear source code structure/order.
- Refactored Settings. Fixed path processing. Added option to edit path to CCX binary. Now rebuild process will account for this path. Attention! In Windows CCX may not work if placed outside 'bin' directory. It needs Cygwin DLLs! So, if you change path to CCX, place there Cygwin DLLs from 'bin' directory.

- In settings added option to edit path to CCX binary. Now rebuild process will account for this path. Attention! In Windows CCX may not work if placed outside 'bin' directory. It needs Cygwin DLLs! So, if you change path to CCX, place there Cygwin DLLs from 'bin' directory.
<br/><br/>



# TODO

## Improvements and bugfixes

Expand Down
19 changes: 5 additions & 14 deletions cae.bat
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
SET qwe=%1
IF "%qwe:~0,2%" == "-a" (
del "*.res"
del "*.prt"
del "*.mdl"
del "*.stt"
del "*.sim"
del "*.inp"
@echo off
IF "%~1" == "-inp" (
start "" "%~dp0\src\cae.exe" -inp %2
) ELSE (
start "" "%~dp0\src\cae.exe" %*
)
IF "%qwe:~0,3%" == "-aa" (
del "centroids.txt"
del "abaqusMacros.py"
)

src/cae.exe
7 changes: 0 additions & 7 deletions cae.desktop

This file was deleted.

42 changes: 0 additions & 42 deletions config/settings_windows.env
Original file line number Diff line number Diff line change
@@ -1,42 +0,0 @@
# Path to CalculiX CrunchiX:
self.path_ccx = 'bin\\ccx_2.15_MT.exe'

# Path to CalculiX GraphiX:
self.path_cgx = 'C:\\cgx.exe'

# Path to Paraview:
self.path_paraview = 'C:\\Program Files\\ParaView\\bin\\paraview.exe'

# Path to text editor:
self.path_editor = 'C:\\Windows\\System32\\notepad.exe'

# Default start model:
self.path_start_model = 'examples/default.inp'

# Logging level:
self.logging_level = 'INFO'

# VTK default view:
self.vtk_view = 'WithEdges'

# Maximize window on startup
self.show_maximized = True

# Show empty keywords in the treeView
self.show_empty_keywords = True

# Expand treeView branches
self.expanded = True

# Show orientation axes in VTK
self.vtk_show_axes = True

# Default VTK view is parallel
self.vtk_parallel_view = True

# Show HTML help with keywords dialog
self.show_help = True

# Show VTK widget (app. restart required)
self.show_vtk = True

130 changes: 130 additions & 0 deletions examples/default.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
kom, INFO: CalculiX object model generated.
job, INFO: Work directory is: d:\Calculix\ccx_cae\examples
cae_ie, INFO: Loading d:\Calculix\ccx_cae\examples\default.inp.
kom, INFO: HEADING-1 created.
kom, INFO: ALL created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: ALL created.
kom, INFO: S1 created.
kom, INFO: S2 created.
kom, INFO: S3 created.
kom, INFO: S4 created.
kom, INFO: S5 created.
kom, INFO: S6 created.
mesh, INFO: 116 nodes
mesh, INFO: 7 nsets: ALL, C3D4, C3D6, C3D8, C3D10, C3D15, C3D20
mesh, INFO: 75 elements
mesh, INFO: 7 elsets: C3D4, C3D6, C3D8, C3D10, C3D15, C3D20, ALL
mesh, INFO: 6 surfaces
VTK, INFO: VTK ugrid is built.
kom, INFO: CalculiX object model generated.
job, INFO: Work directory is: d:\Calculix\ccx_cae\examples
cae_ie, INFO: Loading d:\Calculix\ccx_cae\examples\default.inp.
kom, INFO: HEADING-1 created.
kom, INFO: ALL created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: ALL created.
kom, INFO: S1 created.
kom, INFO: S2 created.
kom, INFO: S3 created.
kom, INFO: S4 created.
kom, INFO: S5 created.
kom, INFO: S6 created.
mesh, INFO: 116 nodes
mesh, INFO: 7 nsets: ALL, C3D4, C3D6, C3D8, C3D10, C3D15, C3D20
mesh, INFO: 75 elements
mesh, INFO: 7 elsets: C3D4, C3D6, C3D8, C3D10, C3D15, C3D20, ALL
mesh, INFO: 6 surfaces
VTK, INFO: VTK ugrid is built.
settings, WARNING: In Windows ccx binary may not work if placed outside 'bin' directory. It needs Cygwin DLLs!
settings, WARNING: For some settings to take effect application's restart may be needed.
kom, INFO: CalculiX object model generated.
job, INFO: Work directory is: d:\Calculix\ccx_cae\examples
cae_ie, INFO: Loading d:\Calculix\ccx_cae\examples\default.inp.
kom, INFO: HEADING-1 created.
kom, INFO: ALL created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: ALL created.
kom, INFO: S1 created.
kom, INFO: S2 created.
kom, INFO: S3 created.
kom, INFO: S4 created.
kom, INFO: S5 created.
kom, INFO: S6 created.
mesh, INFO: 116 nodes
mesh, INFO: 7 nsets: ALL, C3D4, C3D6, C3D8, C3D10, C3D15, C3D20
mesh, INFO: 75 elements
mesh, INFO: 7 elsets: C3D4, C3D6, C3D8, C3D10, C3D15, C3D20, ALL
mesh, INFO: 6 surfaces
VTK, INFO: VTK ugrid is built.
settings, WARNING: In Windows ccx binary may not work if placed outside 'bin' directory. It needs Cygwin DLLs!
settings, WARNING: For some settings to take effect application's restart may be needed.
kom, INFO: PHYSICAL CONSTANTS-1 created.
settings, WARNING: In Windows ccx binary may not work if placed outside 'bin' directory. It needs Cygwin DLLs!
settings, WARNING: For some settings to take effect application's restart may be needed.
settings, WARNING: In Windows ccx binary may not work if placed outside 'bin' directory. It needs Cygwin DLLs!
settings, WARNING: For some settings to take effect application's restart may be needed.
kom, INFO: CalculiX object model generated.
job, INFO: Work directory is: d:\Calculix\ccx_cae\examples
cae_ie, INFO: Loading d:\Calculix\ccx_cae\examples\default.inp.
kom, INFO: HEADING-1 created.
kom, INFO: ALL created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: C3D4 created.
kom, INFO: C3D6 created.
kom, INFO: C3D8 created.
kom, INFO: C3D10 created.
kom, INFO: C3D15 created.
kom, INFO: C3D20 created.
kom, INFO: ALL created.
kom, INFO: S1 created.
kom, INFO: S2 created.
kom, INFO: S3 created.
kom, INFO: S4 created.
kom, INFO: S5 created.
kom, INFO: S6 created.
mesh, INFO: 116 nodes
mesh, INFO: 7 nsets: ALL, C3D4, C3D6, C3D8, C3D10, C3D15, C3D20
mesh, INFO: 75 elements
mesh, INFO: 7 elsets: C3D4, C3D6, C3D8, C3D10, C3D15, C3D20, ALL
mesh, INFO: 6 surfaces
settings, WARNING: In Windows ccx binary may not work if placed outside 'bin' directory. It needs Cygwin DLLs!
settings, WARNING: For some settings to take effect application's restart may be needed.
4 changes: 2 additions & 2 deletions src/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def __init__(self):
self.path_cgx = 'C:\\cgx.exe'
self.path_paraview = 'C:\\Program Files\\ParaView\\bin\\paraview.exe'
self.path_editor = 'C:\\Windows\\System32\\notepad.exe'
self.path_start_model = 'examples/default.inp'
self.path_start_model = 'examples\\default.inp'

# Linux
else:
Expand Down Expand Up @@ -130,9 +130,9 @@ def save(self):
text = str(value.isChecked())
elif class_name == 'QLineEdit':
text = value.text()
text = '\'' + self.p.abspath(text) + '\'' # covert path to absolute
if '\\' in text: # reconstruct path for Windows
text = '\\\\'.join(text.split('\\'))
text = '\'' + self.p.abspath(text) + '\'' # covert path to absolute
value = self.__dict__['label_' + attr]
elif class_name == 'QComboBox':
text = '\'' + value.currentText() + '\''
Expand Down

0 comments on commit 1edd40f

Please sign in to comment.