Changeset 286 for codes/icosagcm/trunk/src/etat0_dcmip2.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_dcmip2.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/etat0_dcmip2.f90

@@ -86 +86 @@
           DO i=ii_begin,ii_end
              ij=(j-1)*iim+i
-             CALL comp_all(xyz_i(ij,:), ps(ij),phis(ij),temp(ij,l), dummy1,dummy2)
+             CALL comp_all(lon_i(ij),lat_i(ij), ps(ij),phis(ij),temp(ij,l), dummy1,dummy2)
           END DO
        END DO
@@ -100 +100 @@
           DO i=ii_begin,ii_end
              ij=(j-1)*iim+i
-             CALL comp_all(xyz_e(ij+u_right,:), dummy1,dummy2,dummy3, ulon(ij+u_right,l),ulat(ij+u_right,l))
-             CALL comp_all(xyz_e(ij+u_lup,:), dummy1,dummy2,dummy3, ulon(ij+u_lup,l),ulat(ij+u_lup,l))
-             CALL comp_all(xyz_e(ij+u_ldown,:), dummy1,dummy2,dummy3, ulon(ij+u_ldown,l),ulat(ij+u_ldown,l))
+             CALL comp_all(lon_e(ij+u_right), lat_e(ij+u_right), &
+                  dummy1,dummy2,dummy3, ulon(ij+u_right,l),ulat(ij+u_right,l))
+             CALL comp_all(lon_e(ij+u_lup), lat_e(ij+u_lup), &
+                  dummy1,dummy2,dummy3, ulon(ij+u_lup,l),ulat(ij+u_lup,l))
+             CALL comp_all(lon_e(ij+u_ldown), lat_e(ij+u_ldown), &
+                  dummy1,dummy2,dummy3, ulon(ij+u_ldown,l),ulat(ij+u_ldown,l))
           END DO
        END DO
@@ -112 +115 @@
     CONTAINS
       
-      SUBROUTINE comp_all(xyz, psj,phisj,tempj, ulonj,ulatj)
+      SUBROUTINE comp_all(lon,lat, psj,phisj,tempj, ulonj,ulatj)
         USE dcmip_initial_conditions_test_1_2_3
-        REAL(rstd), INTENT(IN) :: xyz(3)
+        REAL(rstd), INTENT(IN) :: lon, lat
         REAL(rstd), INTENT(OUT) :: psj,phisj,tempj,ulonj,ulatj
-        REAL :: lon,lat, dummy
+        REAL :: dummy
         dummy=0.
-        CALL xyz2lonlat(xyz,lon,lat)
         SELECT CASE (icase)
         CASE(0)