Skip to content
Snippets Groups Projects
Commit 13d13c84 authored by Antoine Cyril David Hoffmann's avatar Antoine Cyril David Hoffmann :seedling:
Browse files

clarification of the error message for even Npol

parent 9a78d555
No related branches found
No related tags found
No related merge requests found
...@@ -95,7 +95,6 @@ CONTAINS ...@@ -95,7 +95,6 @@ CONTAINS
ERROR STOP '>> ERROR << Parallel BC not recognized' ERROR STOP '>> ERROR << Parallel BC not recognized'
END SELECT END SELECT
CALL speak('Parallel BC : '//parallel_bc) CALL speak('Parallel BC : '//parallel_bc)
END SUBROUTINE geometry_readinputs END SUBROUTINE geometry_readinputs
subroutine eval_magnetic_geometry subroutine eval_magnetic_geometry
...@@ -143,7 +142,10 @@ CONTAINS ...@@ -143,7 +142,10 @@ CONTAINS
CASE('miller','Miller') CASE('miller','Miller')
CALL speak('Miller geometry') CALL speak('Miller geometry')
IF(FLOOR(Npol) .NE. CEILING(Npol)) ERROR STOP "ERROR STOP: Npol must be integer for Miller geometry" IF(FLOOR(Npol) .NE. CEILING(Npol)) ERROR STOP "ERROR STOP: Npol must be integer for Miller geometry"
IF(MODULO(FLOOR(Npol),2) .EQ. 0) ERROR STOP "Npol must be odd for Miller" IF(MODULO(FLOOR(Npol),2) .EQ. 0) THEN
write(*,*) "Npol must be odd for Miller, (Npol = ",Npol,")"
ERROR STOP
ENDIF
call set_miller_parameters(kappa,s_kappa,delta,s_delta,zeta,s_zeta) call set_miller_parameters(kappa,s_kappa,delta,s_delta,zeta,s_zeta)
call get_miller(eps,major_R,major_Z,q0,shear,FLOOR(Npol),alpha_MHD,edge_opt,& call get_miller(eps,major_R,major_Z,q0,shear,FLOOR(Npol),alpha_MHD,edge_opt,&
C_y,C_xy,Cyq0_x0,xpdx_pm_geom,gxx,gxy,gxz,gyy,gyz,gzz,& C_y,C_xy,Cyq0_x0,xpdx_pm_geom,gxx,gxy,gxz,gyy,gyz,gzz,&
...@@ -151,7 +153,10 @@ CONTAINS ...@@ -151,7 +153,10 @@ CONTAINS
CASE('circular','circ') CASE('circular','circ')
CALL speak('Circular geometry') CALL speak('Circular geometry')
IF(FLOOR(Npol) .NE. CEILING(Npol)) ERROR STOP "ERROR STOP: Npol must be integer for circular geometry" IF(FLOOR(Npol) .NE. CEILING(Npol)) ERROR STOP "ERROR STOP: Npol must be integer for circular geometry"
IF(MODULO(FLOOR(Npol),2) .EQ. 0) ERROR STOP "Npol must be odd for circular" IF(MODULO(FLOOR(Npol),2) .EQ. 0) THEN
write(*,*) "Npol must be odd for circular, (Npol = ",Npol,")"
ERROR STOP
ENDIF
call get_circ(eps,major_R,major_Z,q0,shear,& call get_circ(eps,major_R,major_Z,q0,shear,&
C_y,C_xy,Cyq0_x0,gxx,gxy,gxz,gyy,gyz,gzz,& C_y,C_xy,Cyq0_x0,gxx,gxy,gxz,gyy,gyz,gzz,&
dBdx,dBdy,dBdz,hatB,jacobian,hatR,hatZ,dxdR,dxdZ) dBdx,dBdy,dBdz,hatB,jacobian,hatR,hatZ,dxdR,dxdZ)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment