Commit 1ea2b07c authored by Francesco Fambri's avatar Francesco Fambri

2D test extended to 3D.

parent 07304b3f
......@@ -45,16 +45,20 @@ RECURSIVE SUBROUTINE InitParameters(STRLEN,PARSETUP)
end select
END SUBROUTINE InitParameters
RECURSIVE SUBROUTINE InitialData(xGP, tGp, Q)
RECURSIVE SUBROUTINE InitialData(xGPin, tGp, Q)
USE, INTRINSIC :: ISO_C_BINDING
USE MainVariables, ONLY : nVar, nDim, EQN, ICType
IMPLICIT NONE
! Argument list
REAL, INTENT(IN) :: xGP(3), tGp !
REAL, INTENT(IN) :: xGPin(3), tGp !
REAL, INTENT(OUT) :: Q(nVar) !
REAL :: up(nVar),V0(nVar),r
REAL :: up(nVar),V0(nVar),r,xGP(3)
xGP=xGPin
IF(nDim==2) THEN
xGP(3) = 0.
ENDIF
select case(ICType)
case('CCZ4MinkowskiSrc')
!
......@@ -68,9 +72,9 @@ RECURSIVE SUBROUTINE InitialData(xGP, tGp, Q)
!
!V0(54) = 0.2*EXP(-0.5*( xGP(1)**2+xGP(2)**2)/1.0**2 )
!
r = SQRT( xGP(1)**2 + xGP(2)**2 )
r = SQRT( xGP(1)**2 + xGP(2)**2 + xGP(3)**2 )
!
V0(60) = 0.001*EXP(-0.5*( (xGP(1)-2.0)**2+xGP(2)**2+0*xGP(3)**2)/1.0**2 ) + 0.001*EXP(-0.5*( (xGP(1)+2.0)**2+xGP(2)**2+0*xGP(3)**2)/1.0**2 )
V0(60) = 0.001*EXP(-0.5*( (xGP(1)-2.0)**2+xGP(2)**2+xGP(3)**2)/1.0**2 ) + 0.001*EXP(-0.5*( (xGP(1)+2.0)**2+xGP(2)**2+xGP(3)**2)/1.0**2 )
IF( r>5.0 .AND. r<10. ) THEN
V0(61) = -0.2*xGP(2)*( 10.0 - r )/5.0
V0(62) = +0.2*xGP(1)*( 10.0 - r )/5.0
......@@ -81,7 +85,7 @@ RECURSIVE SUBROUTINE InitialData(xGP, tGp, Q)
V0(61:62) = 0.0
ENDIF
V0(63) = 0.0
V0(64) = 0.5*0.001*EXP(-0.5*( (xGP(1)-2.0)**2+xGP(2)**2+0*xGP(3)**2)/1.0**2 ) + 0.5*0.001*EXP(-0.5*( (xGP(1)+2.0)**2+xGP(2)**2+0*xGP(3)**2)/1.0**2 )
V0(64) = 0.5*0.001*EXP(-0.5*( (xGP(1)-2.0)**2+xGP(2)**2+xGP(3)**2)/1.0**2 ) + 0.5*0.001*EXP(-0.5*( (xGP(1)+2.0)**2+xGP(2)**2+xGP(3)**2)/1.0**2 )
!
CASE DEFAULT
PRINT *, 'NOT IMPLEMENTED'
......
......@@ -7,7 +7,7 @@
"output_directory": "./ApplicationExamples/FOCCZ4/FOCCZ4",
"log_file": "whatever.log"
},
"architecture": "skx",
"architecture": "generic",
"computational_domain": {
"dimension": 3,
"end_time": 3.0,
......@@ -15,7 +15,6 @@
-20.0,
-20.0,
-20.0
],
"width": [
40.0,
......@@ -24,10 +23,10 @@
]
},
"shared_memory": {
"cores": 1,
"cores": 10,
"properties_file": "sharedmemory.properties",
"autotuning_strategy": "dummy",
"background_job_consumers": 1
"background_job_consumers": 9
},
"distributed_memory": {
"timeout": 6000,
......@@ -55,8 +54,8 @@
"type": "Limiting-ADER-DG",
"name": "FOCCZ4Solver",
"order": 3,
"maximum_mesh_size": 10.0,
"maximum_mesh_depth": 0,
"maximum_mesh_size": 1.0,
"maximum_mesh_depth": 2,
"time_stepping": "global",
"aderdg_kernel": {
"language": "C",
......@@ -71,7 +70,7 @@
"fusedsource"
],
"optimised_kernel_debugging": [],
"implementation": "optimised"
"implementation": "generic"
},
"point_sources": 0,
"limiter": {
......@@ -108,7 +107,7 @@
"type": "user::defined",
"name": "TecplotWriter",
"time": 0.0,
"repeat": 0.05,
"repeat": 1.0,
"output": "./output/tecplot",
"variables": 96
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment