--- trunk/dyn3d/comgeom.f90 2014/02/05 17:51:07 78 +++ trunk/Sources/dyn3d/comgeom.f 2015/07/24 14:27:59 161 @@ -1,118 +1,105 @@ module comgeom use dimens_m, only: iim, jjm - use paramet_m, only: ip1jmp1, ip1jm implicit none - private iim, jjm, ip1jmp1, ip1jm + private iim, jjm real cu_2d(iim + 1, jjm + 1), cv_2d(iim + 1, jjm) ! in m - real cu(ip1jmp1), cv(ip1jm) ! in m + real cu((iim + 1) * (jjm + 1)), cv((iim + 1) * jjm) ! in m equivalence (cu, cu_2d), (cv, cv_2d) real unscu2_2d(iim + 1, jjm + 1) ! in m-2 - real unscu2(ip1jmp1) ! in m-2 + real unscu2((iim + 1) * (jjm + 1)) ! in m-2 equivalence (unscu2, unscu2_2d) real unscv2_2d(iim + 1, jjm) ! in m-2 - real unscv2(ip1jm) ! in m-2 + real unscv2((iim + 1) * jjm) ! in m-2 equivalence (unscv2, unscv2_2d) - real aire(ip1jmp1), aire_2d(iim + 1, jjm + 1) ! in m2 - real airesurg_2d(iim + 1, jjm + 1), airesurg(ip1jmp1) + real aire((iim + 1) * (jjm + 1)), aire_2d(iim + 1, jjm + 1) ! in m2 + real airesurg_2d(iim + 1, jjm + 1), airesurg((iim + 1) * (jjm + 1)) equivalence (aire, aire_2d), (airesurg, airesurg_2d) real aireu_2d(iim + 1, jjm + 1) ! in m2 - real aireu(ip1jmp1) ! in m2 + real aireu((iim + 1) * (jjm + 1)) ! in m2 equivalence (aireu, aireu_2d) - real airev(ip1jm), airev_2d(iim + 1, jjm) ! in m2 - real unsaire(ip1jmp1), unsaire_2d(iim + 1, jjm + 1) ! in m-2 + real airev((iim + 1) * jjm), airev_2d(iim + 1, jjm) ! in m2 + real unsaire((iim + 1) * (jjm + 1)), unsaire_2d(iim + 1, jjm + 1) ! in m-2 equivalence (airev, airev_2d), (unsaire, unsaire_2d) real apoln, apols ! in m2 real unsairez_2d(iim + 1, jjm) - real unsairez(ip1jm) + real unsairez((iim + 1) * jjm) equivalence (unsairez, unsairez_2d) real alpha1_2d(iim + 1, jjm + 1) - real alpha1(ip1jmp1) + real alpha1((iim + 1) * (jjm + 1)) equivalence (alpha1, alpha1_2d) real alpha2_2d(iim + 1, jjm + 1) - real alpha2(ip1jmp1) + real alpha2((iim + 1) * (jjm + 1)) equivalence (alpha2, alpha2_2d) real alpha3_2d(iim + 1, jjm + 1), alpha4_2d(iim + 1, jjm + 1) - real alpha3(ip1jmp1), alpha4(ip1jmp1) + real alpha3((iim + 1) * (jjm + 1)), alpha4((iim + 1) * (jjm + 1)) equivalence (alpha3, alpha3_2d), (alpha4, alpha4_2d) real alpha1p2_2d(iim + 1, jjm + 1) - real alpha1p2(ip1jmp1) + real alpha1p2((iim + 1) * (jjm + 1)) equivalence (alpha1p2, alpha1p2_2d) real alpha1p4_2d(iim + 1, jjm + 1), alpha2p3_2d(iim + 1, jjm + 1) - real alpha1p4(ip1jmp1), alpha2p3(ip1jmp1) + real alpha1p4((iim + 1) * (jjm + 1)), alpha2p3((iim + 1) * (jjm + 1)) equivalence (alpha1p4, alpha1p4_2d), (alpha2p3, alpha2p3_2d) - real alpha3p4(ip1jmp1) + real alpha3p4((iim + 1) * (jjm + 1)) real alpha3p4_2d(iim + 1, jjm + 1) equivalence (alpha3p4, alpha3p4_2d) real fext_2d(iim + 1, jjm), constang_2d(iim + 1, jjm + 1) - real fext(ip1jm), constang(ip1jmp1) + real fext((iim + 1) * jjm), constang((iim + 1) * (jjm + 1)) equivalence (fext, fext_2d), (constang, constang_2d) - real rlatu(jjm + 1) - ! (latitudes of points of the "scalar" and "u" grid, in rad) - - real rlatv(jjm) - ! (latitudes of points of the "v" grid, in rad, in decreasing order) - - real rlonu(iim + 1) ! longitudes of points of the "u" grid, in rad - - real rlonv(iim + 1) - ! (longitudes of points of the "scalar" and "v" grid, in rad) - real cuvsurcv_2d(iim + 1, jjm), cvsurcuv_2d(iim + 1, jjm) ! no dimension - real cuvsurcv(ip1jm), cvsurcuv(ip1jm) ! no dimension + real cuvsurcv((iim + 1) * jjm), cvsurcuv((iim + 1) * jjm) ! no dimension equivalence (cuvsurcv, cuvsurcv_2d), (cvsurcuv, cvsurcuv_2d) real cvusurcu_2d(iim + 1, jjm + 1), cusurcvu_2d(iim + 1, jjm + 1) ! no dimension - real cvusurcu(ip1jmp1), cusurcvu(ip1jmp1) ! no dimension + real cvusurcu((iim + 1) * (jjm + 1)), cusurcvu((iim + 1) * (jjm + 1)) + ! no dimension equivalence (cvusurcu, cvusurcu_2d), (cusurcvu, cusurcvu_2d) real cuvscvgam1_2d(iim + 1, jjm) - real cuvscvgam1(ip1jm) + real cuvscvgam1((iim + 1) * jjm) equivalence (cuvscvgam1, cuvscvgam1_2d) real cuvscvgam2_2d(iim + 1, jjm), cvuscugam1_2d(iim + 1, jjm + 1) - real cuvscvgam2(ip1jm), cvuscugam1(ip1jmp1) + real cuvscvgam2((iim + 1) * jjm), cvuscugam1((iim + 1) * (jjm + 1)) equivalence (cuvscvgam2, cuvscvgam2_2d), (cvuscugam1, cvuscugam1_2d) real cvuscugam2_2d(iim + 1, jjm + 1), cvscuvgam_2d(iim + 1, jjm) - real cvuscugam2(ip1jmp1), cvscuvgam(ip1jm) + real cvuscugam2((iim + 1) * (jjm + 1)), cvscuvgam((iim + 1) * jjm) equivalence (cvuscugam2, cvuscugam2_2d), (cvscuvgam, cvscuvgam_2d) - real cuscvugam(ip1jmp1) + real cuscvugam((iim + 1) * (jjm + 1)) real cuscvugam_2d(iim + 1, jjm + 1) equivalence (cuscvugam, cuscvugam_2d) real unsapolnga1, unsapolnga2, unsapolsga1, unsapolsga2 real unsair_gam1_2d(iim + 1, jjm + 1), unsair_gam2_2d(iim + 1, jjm + 1) - real unsair_gam1(ip1jmp1), unsair_gam2(ip1jmp1) + real unsair_gam1((iim + 1) * (jjm + 1)), unsair_gam2((iim + 1) * (jjm + 1)) equivalence (unsair_gam1, unsair_gam1_2d), (unsair_gam2, unsair_gam2_2d) real unsairz_gam_2d(iim + 1, jjm) - real unsairz_gam(ip1jm) + real unsairz_gam((iim + 1) * jjm) equivalence (unsairz_gam, unsairz_gam_2d) - real xprimu(iim + 1), xprimv(iim + 1) - save contains @@ -124,11 +111,10 @@ ! Calcul des élongations cuij1, ..., cuij4, cvij1, ..., cvij4 aux mêmes ! endroits que les aires aireij1_2d, ..., aireij4_2d. - ! Choix entre une fonction "f(y)" à dérivée sinusoïdale ou à - ! dérivée tangente hyperbolique. Calcul des coefficients cu_2d, - ! cv_2d, 1. / cu_2d**2, 1. / cv_2d**2. Les coefficients cu_2d et cv_2d - ! permettent de passer des vitesses naturelles aux vitesses - ! covariantes et contravariantes, ou vice-versa. + ! Calcul des coefficients cu_2d, cv_2d, 1. / cu_2d**2, 1. / + ! cv_2d**2. Les coefficients cu_2d et cv_2d permettent de passer + ! des vitesses naturelles aux vitesses covariantes et + ! contravariantes, ou vice-versa. ! On a : ! u(covariant) = cu_2d * u(naturel), u(contravariant) = u(naturel) / cu_2d @@ -138,9 +124,6 @@ ! u(covariant) = cu_2d * cu_2d * u(contravariant) ! v(covariant) = cv_2d * cv_2d * v(contravariant) - ! On a l'application (x(X), y(Y)) avec - im / 2 + 1 <= X <= im / 2 - ! et - jm / 2 <= Y <= jm / 2 - ! x est la longitude du point en radians. ! y est la latitude du point en radians. ! @@ -152,63 +135,43 @@ ! dépendant de j uniquement, sera ici indicé aussi en i pour un ! adressage plus facile en ij. - ! xprimu et xprimv sont respectivement les valeurs de dx / dX aux - ! points u et v. yprimu et yprimv sont respectivement les valeurs - ! de dy / dY aux points u et v. rlatu et rlatv sont respectivement - ! les valeurs de la latitude aux points u et v. cvu et cv_2d sont - ! respectivement les valeurs de cv_2d aux points u et v. - - ! cu_2d, cuv, cuscal, cuz sont respectivement les valeurs de cu_2d - ! aux points u, v, scalaires, et z. Cf. "inigeom.txt". + ! cv_2d est aux points v. cu_2d est aux points u. Cf. "inigeom.txt". USE comconst, ONLY : g, omeg, rad USE comdissnew, ONLY : coefdis, nitergdiv, nitergrot, niterh - use conf_gcm_m, ONLY : fxyhypb, ysinus - USE dimens_m, ONLY : iim, jjm - use fxy_m, only: fxy - use fxyhyper_m, only: fxyhyper - use jumble, only: new_unit + use dynetat0_m, only: xprimp025, xprimm025, rlatu1, rlatu2, rlatu, rlatv, & + yprimu1, yprimu2 use nr_util, only: pi USE paramet_m, ONLY : iip1, jjp1 - USE serre, ONLY : alphax, alphay, clat, clon, dzoomx, dzoomy, grossismx, & - grossismy, pxo, pyo, taux, tauy, transx, transy - ! Modifies pxo, pyo, transx, transy - - ! Variables locales - INTEGER i, j, itmax, itmay, iter, unit - REAL cvu(iip1, jjp1), cuv(iip1, jjm) + ! Local: + INTEGER i, j REAL ai14, ai23, airez, un4rad2 - REAL eps, x1, xo1, f, df, xdm, y1, yo1, ydm REAL coslatm, coslatp, radclatm, radclatp REAL, dimension(iip1, jjp1):: cuij1, cuij2, cuij3, cuij4 ! in m REAL, dimension(iip1, jjp1):: cvij1, cvij2, cvij3, cvij4 ! in m - REAL rlatu1(jjm), yprimu1(jjm), rlatu2(jjm), yprimu2(jjm) - real yprimv(jjm), yprimu(jjp1) REAL gamdi_gdiv, gamdi_grot, gamdi_h - REAL rlonm025(iip1), xprimm025(iip1), rlonp025(iip1), xprimp025(iip1) real, dimension(iim + 1, jjm + 1):: aireij1_2d, aireij2_2d, aireij3_2d, & aireij4_2d ! in m2 - real airuscv2_2d(iim + 1, jjm) - real airvscu2_2d(iim + 1, jjm), aiuscv2gam_2d(iim + 1, jjm) - real aivscu2gam_2d(iim + 1, jjm) !------------------------------------------------------------------ PRINT *, 'Call sequence information: inigeom' - IF (nitergdiv/=2) THEN - gamdi_gdiv = coefdis / (real(nitergdiv)-2.) + IF (nitergdiv /= 2) THEN + gamdi_gdiv = coefdis / (nitergdiv - 2) ELSE gamdi_gdiv = 0. END IF - IF (nitergrot/=2) THEN - gamdi_grot = coefdis / (real(nitergrot)-2.) + + IF (nitergrot /= 2) THEN + gamdi_grot = coefdis / (nitergrot - 2) ELSE gamdi_grot = 0. END IF - IF (niterh/=2) THEN - gamdi_h = coefdis / (real(niterh)-2.) + + IF (niterh /= 2) THEN + gamdi_h = coefdis / (niterh - 2) ELSE gamdi_h = 0. END IF @@ -217,75 +180,6 @@ print *, "gamdi_grot = ", gamdi_grot print *, "gamdi_h = ", gamdi_h - IF (.NOT. fxyhypb) THEN - IF (ysinus) THEN - print *, ' Inigeom, Y = Sinus (Latitude) ' - ! utilisation de f(x, y) avec y = sinus de la latitude - CALL fxysinus(rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, & - rlatu2, yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, & - xprimm025, rlonp025, xprimp025) - ELSE - print *, 'Inigeom, Y = Latitude, der. sinusoid .' - ! utilisation de f(x, y) a tangente sinusoidale, y etant la latit - - pxo = clon * pi / 180. - pyo = 2. * clat * pi / 180. - - ! determination de transx (pour le zoom) par Newton-Raphson - - itmax = 10 - eps = .1E-7 - - xo1 = 0. - DO iter = 1, itmax - x1 = xo1 - f = x1 + alphax * sin(x1-pxo) - df = 1. + alphax * cos(x1-pxo) - x1 = x1 - f / df - xdm = abs(x1-xo1) - IF (xdm<=eps) EXIT - xo1 = x1 - END DO - - transx = xo1 - - itmay = 10 - eps = .1E-7 - - yo1 = 0. - DO iter = 1, itmay - y1 = yo1 - f = y1 + alphay * sin(y1-pyo) - df = 1. + alphay * cos(y1-pyo) - y1 = y1 - f / df - ydm = abs(y1-yo1) - IF (ydm<=eps) EXIT - yo1 = y1 - END DO - - transy = yo1 - - CALL fxy(rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, rlatu2, & - yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, & - rlonp025, xprimp025) - END IF - ELSE - ! Utilisation de fxyhyper, f(x, y) à dérivée tangente hyperbolique - print *, 'Inigeom, Y = Latitude, dérivée tangente hyperbolique' - CALL fxyhyper(clat, grossismy, dzoomy, tauy, clon, grossismx, dzoomx, & - taux, rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, rlatu2, & - yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, & - rlonp025, xprimp025) - END IF - - rlatu(1) = pi / 2. - rlatu(jjp1) = -rlatu(1) - - ! Calcul aux pôles - - yprimu(1) = 0. - yprimu(jjp1) = 0. - un4rad2 = 0.25 * rad * rad ! Cf. "inigeom.txt". Calcul des quatre aires élémentaires @@ -428,16 +322,12 @@ unsairz_gam_2d(iip1, j) = unsairz_gam_2d(1, j) END DO - ! Calcul des élongations cu_2d, cv_2d, cvu + ! Calcul des élongations cu_2d, cv_2d DO j = 1, jjm DO i = 1, iim cv_2d(i, j) = 0.5 * & (cvij2(i, j) + cvij3(i, j) + cvij1(i, j + 1) + cvij4(i, j + 1)) - cvu(i, j) = 0.5 * (cvij1(i, j) + cvij4(i, j) + cvij2(i, j) & - + cvij3(i, j)) - cuv(i, j) = 0.5 * (cuij2(i, j) + cuij3(i, j) + cuij1(i, j + 1) & - + cuij4(i, j + 1)) unscv2_2d(i, j) = 1. / cv_2d(i, j)**2 END DO DO i = 1, iim @@ -448,9 +338,7 @@ cvscuvgam_2d(i, j) = cvsurcuv_2d(i, j)**(-gamdi_grot) END DO cv_2d(iip1, j) = cv_2d(1, j) - cvu(iip1, j) = cvu(1, j) unscv2_2d(iip1, j) = unscv2_2d(1, j) - cuv(iip1, j) = cuv(1, j) cuvsurcv_2d(iip1, j) = cuvsurcv_2d(1, j) cvsurcuv_2d(iip1, j) = cvsurcuv_2d(1, j) cuvscvgam1_2d(iip1, j) = cuvscvgam1_2d(1, j) @@ -482,29 +370,9 @@ cu_2d(:, 1) = 0. unscu2_2d(:, 1) = 0. - cvu(:, 1) = 0. cu_2d(:, jjp1) = 0. unscu2_2d(:, jjp1) = 0. - cvu(:, jjp1) = 0. - - DO j = 1, jjm - DO i = 1, iim - airvscu2_2d(i, j) = airev_2d(i, j) / (cuv(i, j) * cuv(i, j)) - aivscu2gam_2d(i, j) = airvscu2_2d(i, j)**(-gamdi_grot) - END DO - airvscu2_2d(iip1, j) = airvscu2_2d(1, j) - aivscu2gam_2d(iip1, j) = aivscu2gam_2d(1, j) - END DO - - DO j = 2, jjm - DO i = 1, iim - airuscv2_2d(i, j) = aireu_2d(i, j) / (cvu(i, j) * cvu(i, j)) - aiuscv2gam_2d(i, j) = airuscv2_2d(i, j)**(-gamdi_grot) - END DO - airuscv2_2d(iip1, j) = airuscv2_2d(1, j) - aiuscv2gam_2d(iip1, j) = aiuscv2gam_2d(1, j) - END DO ! Calcul des aires aux pôles : @@ -532,22 +400,10 @@ END DO ! Périodicité en longitude - - DO j = 1, jjm - fext_2d(iip1, j) = fext_2d(1, j) - END DO DO j = 1, jjp1 constang_2d(iip1, j) = constang_2d(1, j) END DO - call new_unit(unit) - open(unit, file="longitude_latitude.txt", status="replace", action="write") - write(unit, fmt=*) '"longitudes at V points (degrees)"', rlonv * 180. / pi - write(unit, fmt=*) '"latitudes at V points (degrees)"', rlatv * 180. / pi - write(unit, fmt=*) '"longitudes at U points (degrees)"', rlonu * 180. / pi - write(unit, fmt=*) '"latitudes at U points (degrees)"', rlatu * 180. / pi - close(unit) - END SUBROUTINE inigeom end module comgeom