Changeset 286 for codes/icosagcm/trunk/src/etat0_dcmip4.f90

Timestamp:

10/20/14 23:42:26 (10 years ago)

Author:

dubos

Message:

Partial etat0 cleanup (removed calls to xyz2lonlat)

File:

• codes/icosagcm/trunk/src/etat0_dcmip4.f90 (modified) (7 diffs)

codes/icosagcm/trunk/src/etat0_dcmip4.f90

@@ -121 +121 @@
           ij=(j-1)*iim+i
           
-          CALL xyz2lonlat(xyz_e(ij+u_right,:)/radius,lon,lat)
+          lon=lon_e(ij+u_right) ; lat=lat_e(ij+u_right)
           K=sin(latc)*sin(lat)+cos(latc)*cos(lat)*cos(lon-lonc)
           r=radius*acos(K)
@@ -127 +127 @@
           u(ij+u_right,l) = utot * sum(elon_e(ij+u_right,:) * ep_e(ij+u_right,:))
 
-
-          CALL xyz2lonlat(xyz_e(ij+u_lup,:)/radius,lon,lat)
+          lon=lon_e(ij+u_lup) ; lat=lat_e(ij+u_lup)
           K=sin(latc)*sin(lat)+cos(latc)*cos(lat)*cos(lon-lonc)
           r=radius*acos(K)
@@ -134 +133 @@
           u(ij+u_lup,l) = utot * sum(elon_e(ij+u_lup,:) * ep_e(ij+u_lup,:))
 
-          CALL xyz2lonlat(xyz_e(ij+u_ldown,:)/radius,lon,lat)
+          lon=lon_e(ij+u_ldown) ; lat=lat_e(ij+u_ldown)
           K=sin(latc)*sin(lat)+cos(latc)*cos(lat)*cos(lon-lonc)
           r=radius*acos(K)
@@ -151 +150 @@
          DO i=ii_begin-1,ii_end+1
            ij=(j-1)*iim+i
-           CALL xyz2lonlat(xyz_i(ij,:)/radius,lon,lat)
-            
+           lat=lat_i(ij)
             Y(ij,l)=((-2*sin(lat)**6*(cos(lat)**2+1./3)+10./63)*2*u0*cos(etav(l))**1.5     &
                                 + (8./5*cos(lat)**3*(sin(lat)**2+2./3)-Pi/4)*radius*Omega)
@@ -168 +166 @@
        DO i=ii_begin,ii_end
          ij=(j-1)*iim+i
-         CALL xyz2lonlat(xyz_i(ij,:)/radius,lon,lat)
+         lat=lat_i(ij)
          phis(ij)=phis_ave+u0*cos(etavs)**1.5*( (-2*sin(lat)**6 * (cos(lat)**2+1./3) + 10./63 )*u0*cos(etavs)**1.5  &
                                            +(8./5*cos(lat)**3 * (sin(lat)**2 + 2./3) - Pi/4)*radius*Omega )
@@ -191 +189 @@
            DO i=ii_begin,ii_end
              ij=(j-1)*iim+i
-             CALL xyz2lonlat(xyz_i(ij,:)/radius,lon,lat)
+             lon=lon_i(ij) ; lat=lat_i(ij)
              dthetaodeta=dthetaodeta_ave + 3./4. * Pi * u0/Rd*(1-kappa)*eta(l)**(-kappa)*sin(etav(l))*cos(etav(l))**0.5 * Y(ij,l) & 
                                         + 3/8. * Pi**2*u0/Rd * eta(l)**(1-kappa) * cos(etav(l))**1.5 * Y(ij,l)                    & 
@@ -220 +218 @@
            DO i=ii_begin,ii_end
              ij=(j-1)*iim+i
-             CALL xyz2lonlat(xyz_i(ij,:)/radius,lon,lat)
-             q(ij,l,1)=q0*exp(-(lat/latw)**4)*exp(-((eta(l)-1)*preff/pw)**2)
+             q(ij,l,1)=q0*exp(-(lat_i(ij)/latw)**4)*exp(-((eta(l)-1)*preff/pw)**2)
            ENDDO
          ENDDO