Changeset 2963 for LMDZ5/trunk

Timestamp:

Jul 24, 2017, 3:56:41 PM (7 years ago)

Author:

dcugnet

Message:

Fix a bug in the longitude interpolation of ozone, leading for some
resolutions to a too small margin to ensure inetrpolation without
any extrapolation.
Also, minor fix in regular_lonlat_mod.F90 routine to ensure that

boundslon_reg(i,east)>boundslon_reg(i,west).

Location:

LMDZ5/trunk/libf

Files:

• dynphy_lonlat/inigeomphy_mod.F90 (modified) (1 diff)
• phy_common/regular_lonlat_mod.F90 (modified) (1 diff)
• phylmd/regr_horiz_time_climoz_m.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/dynphy_lonlat/inigeomphy_mod.F90

@@ -93 +93 @@
   
   DO i=1,iim
-   boundslon_reg(i,east)=rlonu(i) 
-   boundslon_reg(i,west)=rlonu(i+1) 
+   boundslon_reg(i,west)=rlonu(i) 
+   boundslon_reg(i,east)=rlonu(i+1) 
   ENDDO
 

LMDZ5/trunk/libf/phy_common/regular_lonlat_mod.F90

@@ -8 +8 @@
   INTEGER, PARAMETER :: south_west=3     ! boundaries of regular lontlat
   INTEGER, PARAMETER :: south_east=4     ! boundaries of regular lontlat
-  INTEGER, PARAMETER :: east=1           ! boundaries of regular lontlat
-  INTEGER, PARAMETER :: west=2           ! boundaries of regular lontlat
+  INTEGER, PARAMETER :: east=2           ! boundaries of regular lontlat
+  INTEGER, PARAMETER :: west=1           ! boundaries of regular lontlat
   INTEGER, PARAMETER :: north=1          ! boundaries of regular lontlat
   INTEGER, PARAMETER :: south=2          ! boundaries of regular lontlat

LMDZ5/trunk/libf/phylmd/regr_horiz_time_climoz_m.F90

@@ -179 +179 @@
   IF(l3D) THEN
     !--- Compute input edges longitudes vector (no end point yet)
-    ALLOCATE(v1(nlon_in))
+    ALLOCATE(v1(nlon_in+1))
     v1(1)=(lon_in(nlon_in)+lon_in(1))/2.-pi
     FORALL(i=2:nlon_in) v1(i)=(lon_in(i-1)+lon_in(i))/2.
+    v1(nlon_in+1)=v1(1)+2.*pi
     DEALLOCATE(lon_in)
 
-    !--- Shift input longitudes vector until it contains first output point boundslon_reg(1,east)
-    v1=v1+2*pi*REAL(FLOOR((boundslon_reg(1,east)-v1(1))/(2.*pi)))
-
-    !--- Ensure first input longitudes interval contains first output point boundslon_reg(1,east)
-    dx1=locate(v1,boundslon_reg(1,east))-1
+    !--- Shift input longitudes vector until it contains first output point boundslon_reg(1,west)
+    v1=v1+2*pi*REAL(FLOOR((boundslon_reg(1,west)-v1(1))/(2.*pi)))
+
+    !--- Ensure first input longitudes interval contains first output point boundslon_reg(1,west)
+    dx1=locate(v1,boundslon_reg(1,west))-1
     v1=CSHIFT(v1,SHIFT=dx1,DIM=1); v1(nlon_in-dx1+1:)=v1(nlon_in-dx1+1:)+2.*pi
 
-    !--- Extend input longitudes vector until last interval contains boundslon_reg(nlat_ou,west)
-    dx2=0; DO WHILE(v1(1+dx2)+2.*pi<boundslon_reg(nlat_ou,west)); dx2=dx2+1; END DO
+    !--- Extend input longitudes vector until last interval contains boundslon_reg(nlat_ou,east)
+    dx2=0; DO WHILE(v1(1+dx2)+2.*pi<boundslon_reg(nlon_ou,east)); dx2=dx2+1; END DO
 
     !--- Final edges longitudes vector (with margin and end point)
-    ALLOCATE(lon_in_edge(nlon_in+dx2+1)); lon_in_edge=[v1,v1(1:1+dx2)+2.*pi]
+    ALLOCATE(lon_in_edge(nlon_in+dx2+1)); lon_in_edge=[v1,v1(2:1+dx2)+2.*pi]
     DEALLOCATE(v1)
   END IF
@@ -330 +331 @@
     ALLOCATE(o3_regr_lon(nlon_ou, nlat_in, nlev_in, ie-ib+1, read_climoz))
     CALL regr_conserv(1, o3_in3, xs = lon_in_edge,                             &
-                        xt = [boundslon_reg(1,east),boundslon_reg(:,west)],    &
+                        xt = [boundslon_reg(1,west),boundslon_reg(:,east)],    &
                         vt = o3_regr_lon, slope = slopes(1,o3_in3, lon_in_edge))
     DEALLOCATE(o3_in3)