• R/O
  • SSH

ateles: 提交

Adaptive Tree based Efficient and Lithe Equation Solver | DG solver of APES


Commit MetaInfo

修訂29bbc21f27424ea143dabfdd1fb4ed8587394d96 (tree)
時間2022-06-22 23:41:03
作者Harald Klimach <harald.klimach@dlr....>
CommiterHarald Klimach

Log Message

Revert changes to the cube container initialization for the faces.

Change Summary

差異

diff -r 789bd5231c7f -r 29bbc21f2742 examples/euler/3D/shear_layer_Q4/sdr_timing.res
--- a/examples/euler/3D/shear_layer_Q4/sdr_timing.res Wed Jun 22 15:58:53 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
1-# Revision Casename nFluids nBnds nProcs MFEPS loadconfig| proto| flooding| inHeritDR| refineLeaf| smoothLeaf|proto2treelm| dump_mesh|
2- 6d59a24ca64c+ simulation 128 128 1 9.831E-03 1.721E-03 8.739E-03 368.458E-06 0.000E+00 664.964E-06 21.400E-06 807.724E-06 533.210E-06
3- 52793516b743+ simulation 128 128 1 3.286E-03 5.572E-03 26.395E-03 887.000E-06 0.000E+00 1.650E-03 23.000E-06 2.734E-03 1.399E-03
diff -r 789bd5231c7f -r 29bbc21f2742 examples/euler/3D/shear_layer_Q4/timing.res
--- a/examples/euler/3D/shear_layer_Q4/timing.res Wed Jun 22 15:58:53 2022 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
1-# Revision Casename nProcs threads DomSize Dofs DofPE DofPEPV nVars KEUPS KDUPS maxIter| timeAteles| initialize| preciceInit| simLoop| commState| Output| preprocKern| projToFace| setBnd| invMassMat| numFlux| physFlux| pF_initState| pF_projConv| pF_pen| pF_eval|pF_projTestFu| projTestFun| stabalize| updateBG| getTimestep| TimeStepInfo| syncUpdate| convCheck| checkVal| preciceAdv| readBC| preciceWrite| MemRSS MemHWM
2- d59c3b3f0d9d shear_layer_modg 1 1 128 40960 320 64 5 420.108E-03 134.434E+00 2 698.924E-03 87.623E-03 0.000E+00 609.367E-03 11.073E-06 0.000E+00 2.486E-06 17.486E-03 69.840E-03 1.009E-03 184.745E-03 320.256E-03 6.460E-03 305.302E-03 47.769E-06 1.724E-03 4.521E-03 888.101E-06 2.956E-06 0.000E+00 4.459E-06 11.173E-03 40.016E-06 0.000E+00 2.496E-06 0.000E+00 0.000E+00 0.000E+00 35744 35744
3- 7b810a8464d2+ shear_layer_modg 1 4 128 40960 320 64 5 169.970E-03 54.391E+00 2 1.765E+00 252.043E-03 0.000E+00 1.506E+00 85.000E-06 0.000E+00 12.000E-06 20.330E-03 195.899E-03 14.048E-03 489.628E-03 746.230E-03 4.148E-03 708.089E-03 175.000E-06 14.186E-03 17.164E-03 4.393E-03 28.000E-06 0.000E+00 19.000E-06 28.758E-03 78.000E-06 0.000E+00 7.000E-06 0.000E+00 0.000E+00 0.000E+00 0.000E+00 0 0
diff -r 789bd5231c7f -r 29bbc21f2742 source/atl_cube_container_module.f90
--- a/source/atl_cube_container_module.f90 Wed Jun 22 15:58:53 2022 +0200
+++ b/source/atl_cube_container_module.f90 Wed Jun 22 16:41:03 2022 +0200
@@ -158,7 +158,6 @@
158158
159159 public :: atl_cube_container_type, atl_init_cube_container
160160
161-
162161 contains
163162
164163
@@ -289,8 +288,6 @@
289288 do iLevel = tree%global%minLevel, tree%global%maxLevel
290289 call atl_init_cube_elem( element = cube_container%mesh_list(iLevel), &
291290 & descriptor = levelDesc(iLevel), &
292- & faces = faces(iLevel), &
293- & faces_stab = faces_stab(iLevel), &
294291 & level = iLevel, &
295292 & tree = tree )
296293 end do
@@ -316,6 +313,13 @@
316313 & boundary_list = cube_container%boundary_stab_list, &
317314 & scheme_list = cube_container%scheme_list )
318315
316+ do iLevel = tree%global%minLevel, tree%global%maxLevel
317+ ! This component needs to be explicitely copied as a workaround for
318+ ! the cray compiler
319+ cube_container%mesh_list(ilevel)%faces = faces(ilevel)
320+ cube_container%mesh_list(ilevel)%faces_stab = faces_stab(ilevel)
321+ end do
322+
319323 end subroutine atl_init_cube_container
320324 ! ******************************************************************************!
321325
diff -r 789bd5231c7f -r 29bbc21f2742 source/atl_cube_elem_module.f90
--- a/source/atl_cube_elem_module.f90 Wed Jun 22 15:58:53 2022 +0200
+++ b/source/atl_cube_elem_module.f90 Wed Jun 22 16:41:03 2022 +0200
@@ -99,16 +99,13 @@
9999 public :: atl_cube_elem_type, atl_init_cube_elem
100100 public :: atl_get_numberOfElemsPerLevel
101101
102-
103102 contains
104103
105-
106104 !> Initialize the cubic elements.
107105 !!
108106 !! The output element represents all cubic elements given by their tree ids
109107 !! in the tree.
110- subroutine atl_init_cube_elem( element, descriptor, faces, faces_stab, &
111- & level, tree )
108+ subroutine atl_init_cube_elem( element, descriptor, level, tree )
112109 ! --------------------------------------------------------------------------
113110 !> This is the output and represenets the cubic elements given
114111 !! as a subset of tree ids in the complete tree.
@@ -121,12 +118,6 @@
121118 !! treelmesh, and need to be passed in here.
122119 type(tem_levelDesc_type), intent(in) :: descriptor
123120
124- !> Face descriptions.
125- type(tem_face_type), intent(in) :: faces
126-
127- !> Face description for the stabilization.
128- type(tem_face_type), intent(in) :: faces_stab
129-
130121 !> The tree representation of your mesh.
131122 type(treelmesh_type), intent(in) :: tree
132123
@@ -137,10 +128,8 @@
137128
138129 write(logUnit(1),*) "Initializing Cubic elements ..."
139130
140- ! Copy of descriptor information
131+ ! Copy of descriptor information, HK: really necessary?
141132 element%descriptor = descriptor
142- element%faces = faces
143- element%faces_stab = faces_stab
144133
145134 ! Simple geometrical info
146135 element%length = tree%global%BoundingCubeLength / 2**level
Show on old repository browser