Changeset 1323 for LMDZ4/trunk/libf/dyn3dpar/startvar.F90

Timestamp:

Mar 12, 2010, 5:19:12 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Changes made in r1293 are integrated into the trunk
Start files are identical between r1293 and this version

---

Les modifications de la r1293 sont intégrées à la trunk
Les fichiers start et startphy sont identiques entre la version 1293 et celle-ci

File:

• LMDZ4/trunk/libf/dyn3dpar/startvar.F90 (modified) (8 diffs)

LMDZ4/trunk/libf/dyn3dpar/startvar.F90

@@ -20 +20 @@
 !
 !  - A 1D variable on the physical grid :
-!    CALL startget(varname, iml, jml,  lon_in,  lat_in,  nbindex,              &
+!    CALL startget_phys1d((varname, iml, jml,  lon_in,  lat_in,  nbindex,              &
 !           champ, val_exp,      jml2, lon_in2, lat_in2, ibar )
 !
 !  - A 2D variable on the dynamical grid :
-!    CALL startget(varname, iml, jml,  lon_in,  lat_in,                        &
+!    CALL startget_phys2d(varname, iml, jml,  lon_in,  lat_in,                        &
 !           champ, val_exp,      jml2, lon_in2, lat_in2, ibar )             
 !
 !  - A 3D variable on the dynamical grid :
-!    CALL startget(varname, iml, jml,  lon_in,  lat_in,  lml, pls, workvar,    &
+!    CALL startget_dyn((varname, iml, jml,  lon_in,  lat_in,  lml, pls, workvar,    &
 !           champ, val_exp,      jml2, lon_in2, lat_in2, ibar )
 !
@@ -54 +54 @@
 
   PRIVATE
-  PUBLIC startget
-  INTERFACE startget
-    MODULE PROCEDURE startget_phys1d, startget_phys2d, startget_dyn
-  END INTERFACE
+  PUBLIC startget_phys2d, startget_phys1d, startget_dyn
+!  INTERFACE startget
+!    MODULE PROCEDURE startget_phys1d, startget_phys2d, startget_dyn
+!  END INTERFACE
 
   REAL,    SAVE :: deg2rad,  pi
@@ -254 +254 @@
 !-------------------------------------------------------------------------------
 !
-SUBROUTINE startget_dyn(varname, iml, jml,  lon_in,  lat_in,  lml, pls,workvar,&
-                     champ, val_exp,  jml2, lon_in2, lat_in2, ibar)
+SUBROUTINE startget_dyn(varname,  lon_in,  lat_in, pls,workvar,&
+                     champ, val_exp, lon_in2, lat_in2, ibar)
+
+      use assert_eq_m, only: assert_eq
+
+
 !-------------------------------------------------------------------------------
 ! Comment:
@@ -261 +265 @@
 !-------------------------------------------------------------------------------
 ! Arguments:
-  CHARACTER(LEN=*),             INTENT(IN)    :: varname
-  INTEGER,                      INTENT(IN)    :: iml, jml
-  REAL, DIMENSION(iml),         INTENT(IN)    :: lon_in
-  REAL, DIMENSION(jml),         INTENT(IN)    :: lat_in
-  INTEGER,                      INTENT(IN)    :: lml
-  REAL, DIMENSION(iml,jml,lml), INTENT(IN)    :: pls, workvar
-  REAL, DIMENSION(iml,jml,lml), INTENT(INOUT) :: champ
-  REAL,                         INTENT(IN)    :: val_exp
-  INTEGER,                      INTENT(IN)    :: jml2
-  REAL, DIMENSION(iml),         INTENT(IN)    :: lon_in2
-  REAL, DIMENSION(jml2),        INTENT(IN)    :: lat_in2
+  CHARACTER(LEN=*), INTENT(IN)    :: varname
+  REAL, INTENT(IN)    :: lon_in(:) ! dim(iml)
+  REAL, INTENT(IN)    :: lat_in(:) ! dim(jml)
+  REAL, INTENT(IN)    :: pls(:, :, :) ! dim(iml, jml, lml)
+  REAL, INTENT(IN)    :: workvar(:, :, :) ! dim(iml, jml, lml)
+  REAL, INTENT(INOUT) :: champ(:, :, :) ! dim(iml, jml, lml)
+  REAL, INTENT(IN)    :: val_exp
+  REAL, INTENT(IN)    :: lon_in2(:) ! dim(iml)
+  REAL, INTENT(IN)    :: lat_in2(:) ! dim(jml2)
   LOGICAL,                      INTENT(IN)    :: ibar
 !-------------------------------------------------------------------------------
@@ -280 +282 @@
 #include "paramet.h"
 #include "comgeom2.h"
+  INTEGER    :: iml, jml
+  INTEGER    :: lml
+  INTEGER    :: jml2
   REAL, DIMENSION(:,:,:), POINTER :: v3d=>NULL()
   CHARACTER(LEN=10) :: vname
@@ -287 +292 @@
   NULLIFY(v3d)
   IF(MINVAL(champ)==MAXVAL(champ).AND.MINVAL(champ)==val_exp) THEN
+
+      iml = assert_eq((/size(lon_in), size(pls, 1), size(workvar, 1), &
+     &     size(champ, 1), size(lon_in2)/), "startget_dyn iml")
+      jml = assert_eq(size(lat_in), size(pls, 2), size(workvar, 2),   &
+     &     size(champ, 2), "startget_dyn jml")
+      lml = assert_eq(size(pls, 3), size(workvar, 3), size(champ, 3), &
+     &     "startget_dyn lml")
+      jml2 = size(lat_in2)
 
 !--- READING UNALLOCATED FILES
@@ -723 +736 @@
 !
 !-------------------------------------------------------------------------------
+
+  USE inter_barxy_m, only: inter_barxy
+
 ! Arguments:
   CHARACTER(LEN=*),       INTENT(IN)  :: vname
@@ -750 +766 @@
                '---------------------------------------------------------------'
     END IF
-    CALL inter_barxy(ii, jj-1, lon, lat, vari, i1-1, j2, lon2, lat2, j1, vtmp)
+    CALL inter_barxy(lon, lat(:jj-1), vari, lon2(:i1-1), lat2(:j2), vtmp)
   ELSE
     CALL grille_m   (ii, jj,   lon, lat, vari, i1-1, j1, lon1, lat1,     vtmp)