Skip to content

Commit

Permalink
better switching to GNU version 3 (changed the beautifier to also mak…
Browse files Browse the repository at this point in the history 
…e changes in *.c, *.cu, *.pl, *.py etc files); also removed doc/call_trees_of_the_source_code/html: the call tree of the code changes all the time, and we provide a script to create it, thus there is no need to store it in Git
  • Loading branch information
@komatits
komatits committed Jun 26, 2017
1 parent 44402ed commit 320e50b
Show file tree
Hide file tree
Showing 3,033 changed files with 366 additions and 147,735 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 7 additions & 7 deletions EXAMPLES/paper_axisymmetry_example/JensenMesh.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
#### |<------>---> | M | |
#### | l1 l2 | L | |
#### |_______________________________________________________________| | v
#### |_____________________________C_P_M_L_______________________________|
#### |_____________________________C_P_M_L_______________________________|
#### <------------------------------------------------------------->
#### lx
####
#### To understand that script:
#### _make sure the script tab (python command line) is open in Trelis/Cubit :
#### Trelis 15.0: Tools -> Options -> Layout --> Show Script Tab
#### Cubit 15.1: Tools -> Options -> Layout --> Cubit Layout --> Show Script Tab
####
####
#### _copy paste one line of this script after another in this script tab and
#### observe what happens.
####
Expand Down Expand Up @@ -126,7 +126,7 @@
# volumes, creating non-manifold geometry. Both imprinting and merging are necessary to make adjacent
# volumes have identical meshes at their intersection.

cubit.cmd('merge vol all')
cubit.cmd('merge vol all')
cubit.cmd('imprint vol all')

### Meshing the surfaces :
Expand Down Expand Up @@ -162,7 +162,7 @@
cubit.cmd('block 102 (face all except face in block 1 2 100 101)')
# xz pmls :
cubit.cmd('set duplicate block elements on')
cubit.cmd('block 103 face in block 102 with z_coord < '+str(-lz))
cubit.cmd('block 103 face in block 102 with z_coord < '+str(-lz))

### Create geometry from free mesh (necessary to merge) :
cubit.cmd('create mesh geometry Face in block 100 feature_angle 135.0 keep')
Expand Down Expand Up @@ -212,15 +212,15 @@
cubit.cmd('compress')

### Creating absorbing surfaces block (after the merging!)
cubit.cmd('block 3 edge in curve 15 18 19')
cubit.cmd('block 3 edge in curve 15 18 19')
cubit.cmd('block 3 name "abs_right"')
cubit.cmd('block 3 element type BAR2')
cubit.cmd('block 4 edge in curve 12 17')
cubit.cmd('block 4 edge in curve 12 17')
cubit.cmd('block 4 name "abs_bottom"')
cubit.cmd('block 4 element type BAR2')

### Creating topo surface block (after the merging!)
cubit.cmd('block 5 edge in curve 6 14')
cubit.cmd('block 5 edge in curve 6 14')
cubit.cmd('block 5 name "topo"')
cubit.cmd('block 5 element type BAR2')

Expand Down
4 changes: 2 additions & 2 deletions EXAMPLES/paper_axisymmetry_example/computeTLmpi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

def distributeN(rank,P,N):
"""
Distribute N consecutive things (rows of a matrix , blocks of a 1D array)
Distribute N consecutive things (rows of a matrix , blocks of a 1D array)
as evenly as possible over a given communicator.
Uneven workload (differs by 1 at most) is on the initial ranks.
Expand Down Expand Up @@ -61,7 +61,7 @@ def distributeN(rank,P,N):
if rank >= remainder:
rstart += remainder
rend += remainder
else:
else:
rstart += rank
rend += rank + 1
return rstart,rend
Expand Down
16 changes: 8 additions & 8 deletions EXAMPLES/paper_axisymmetry_example/meshing_script_without_delamination_water.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@

# All the distances are given in meters. See the header for a draft of the model
#f0 = 250e3
#fmax = f0 * 2.5 # maximal frequency used in specfem to calculte the resolution (true for a Ricker source) fmax = f0*2,5
#lambda_min = 1036/fmax # smaller wavelength due to the small value of shear wave speed in epoxy ... thus normally the model is enough sampled
#fmax = f0 * 2.5 # maximal frequency used in specfem to calculte the resolution (true for a Ricker source) fmax = f0*2,5
#lambda_min = 1036/fmax # smaller wavelength due to the small value of shear wave speed in epoxy ... thus normally the model is enough sampled
e#lementSize = lambda_min # Average spectral elements size
elementSize = 1.326e-3
lx = 370.0e-3 # TODO For the moment, I use the same dimension as the transmision through the homogeneous plate
lzUp = 3.0e-3 # the value lx is used in runSpecFem.py, more precisely in the script CreateReceivers to generate a receiver line over the whole domain
lzGlue = 0.25e-3 # it will be a good thing to give these geometric parameters as argument into the make_mesh.sh script !!!!
lzUp = 3.0e-3 # the value lx is used in runSpecFem.py, more precisely in the script CreateReceivers to generate a receiver line over the whole domain
lzGlue = 0.25e-3 # it will be a good thing to give these geometric parameters as argument into the make_mesh.sh script !!!!
lzDown = 3.0e-3
lwUp = 110.0e-3 # same dimension as the transmision through the homogeneous plate
lwDown = 280.0e-3 # same dimension as the transmision through the homogeneous plate
Expand Down Expand Up @@ -262,19 +262,19 @@
cubit.cmd('block 1005 attribute index 1 4')
cubit.cmd('block 1005 element type QUAD4')

cubit.cmd('block 10 edge in curve 45 34 19 21 23 32 49')
cubit.cmd('block 10 edge in curve 45 34 19 21 23 32 49')
cubit.cmd('block 10 name "abs_right"')
cubit.cmd('block 10 element type BAR2')

cubit.cmd('block 11 edge in curve 52 44 50')
cubit.cmd('block 11 edge in curve 52 44 50')
cubit.cmd('block 11 name "abs_bottom"')
cubit.cmd('block 11 element type BAR2')

cubit.cmd('block 12 edge in curve 47 38 26 28 30 36 51')
cubit.cmd('block 12 edge in curve 47 38 26 28 30 36 51')
cubit.cmd('block 12 name "abs_left"')
cubit.cmd('block 12 element type BAR2')

cubit.cmd('block 13 edge in curve 48 41 46')
cubit.cmd('block 13 edge in curve 48 41 46')
cubit.cmd('block 13 name "abs_top"')
cubit.cmd('block 13 element type BAR2')

Expand Down
2 changes: 1 addition & 1 deletion EXAMPLES/thermocline/generate_shallow_water_profile_script_by_Paul_Cristini.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import pylab as pl


zc = 30. # position of
zc = 30. # position of
Cdeb = 1490. # minimum sound speed
Cinc = 40.
cc = 5.
Expand Down
4 changes: 2 additions & 2 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand Down Expand Up @@ -128,7 +128,7 @@ SCOTCH_FLAGS = @FC_DEFINE@USE_SCOTCH $(SCOTCH_INC)
# default cuda libraries
# runtime library -lcudart -lcuda and -lcublas needed

CUDA_FLAGS = @CUDA_FLAGS@
CUDA_FLAGS = @CUDA_FLAGS@
CUDA_INC = @CUDA_CPPFLAGS@ -I${SETUP}
CUDA_LINK = @CUDA_LDFLAGS@ @CUDA_LIBS@ -lstdc++

Expand Down
2 changes: 1 addition & 1 deletion config.guess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ timestamp='2012-06-10'

# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
Expand Down
2 changes: 1 addition & 1 deletion config.sub
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ timestamp='2012-04-18'
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand Down
112 changes: 0 additions & 112 deletions doc/call_trees_of_the_source_code/html/annotated.html
View file

This file was deleted.

5 changes: 0 additions & 5 deletions doc/call_trees_of_the_source_code/html/annotated_dup.js
View file

This file was deleted.

Binary file removed doc/call_trees_of_the_source_code/html/bc_s.png
View file
Binary file not shown.
Binary file removed doc/call_trees_of_the_source_code/html/bdwn.png
View file
Binary file not shown.
116 changes: 0 additions & 116 deletions doc/call_trees_of_the_source_code/html/classes.html
View file

This file was deleted.

Binary file removed doc/call_trees_of_the_source_code/html/closed.png
View file
Binary file not shown.
Loading

0 comments on commit 320e50b

Please sign in to comment.