--- trunk/dyn3d/serre.f 2015/02/03 19:30:48 122 +++ trunk/dyn3d/serre.f 2015/02/10 17:58:56 127 @@ -2,8 +2,8 @@ implicit none - REAL:: clon = 0. ! longitude of the center of the zoom, in degrees - real:: clat = 0. ! latitude of the center of the zoom, in degrees + REAL:: clon = 0. ! longitude of the center of the zoom, in rad + real:: clat = 0. ! latitude of the center of the zoom, in rad real:: grossismx = 1., grossismy = 1. ! facteurs de grossissement du zoom, selon la longitude et la latitude @@ -21,10 +21,13 @@ subroutine read_serre use unit_nml_m, only: unit_nml - use nr_util, only: assert + use nr_util, only: assert, pi - namelist /serre_nml/ clon, clat, grossismx, grossismy, dzoomx, dzoomy, & - taux, tauy + REAL:: clon_deg = 0. ! longitude of the center of the zoom, in degrees + real:: clat_deg = 0. ! latitude of the center of the zoom, in degrees + + namelist /serre_nml/ clon_deg, clat_deg, grossismx, grossismy, dzoomx, & + dzoomy, taux, tauy !------------------------------------------------- @@ -35,6 +38,8 @@ call assert(grossismx >= 1. .and. grossismy >= 1., "read_serre grossism") call assert(dzoomx > 0., dzoomx < 1., dzoomy < 1., & "read_serre dzoomx dzoomy") + clon = clon_deg / 180. * pi + clat = clat_deg / 180. * pi end subroutine read_serre