--- trunk/dyn3d/comgeom.f 2014/09/18 19:56:46 113 +++ trunk/Sources/dyn3d/comgeom.f 2015/07/24 14:27:59 161 @@ -64,17 +64,6 @@ 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((iim + 1) * jjm), cvsurcuv((iim + 1) * jjm) ! no dimension equivalence (cuvsurcv, cuvsurcv_2d), (cvsurcuv, cvsurcuv_2d) @@ -111,8 +100,6 @@ 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,55 +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 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 ! Local: - INTEGER i, j, unit - REAL cvu(iip1, jjp1), cuv(iip1, jjm) + INTEGER i, j REAL ai14, ai23, airez, un4rad2 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 @@ -209,19 +180,6 @@ print *, "gamdi_grot = ", gamdi_grot print *, "gamdi_h = ", gamdi_h - print *, 'inigeom: Y = latitude, dérivée tangente hyperbolique' - CALL fxyhyper(rlatu, yprimu, rlatv, yprimv, rlatu1, yprimu1, rlatu2, & - yprimu2, rlonu, xprimu, rlonv, xprimv, rlonm025, xprimm025, & - rlonp025, xprimp025) - - 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 @@ -364,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 @@ -384,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) @@ -418,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 : @@ -472,14 +404,6 @@ 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