Changeset 370 for LMDZ.3.3/branches/rel-LF/libf/dyn3d/startvar.F

Timestamp:

Jul 10, 2002, 5:07:19 PM (22 years ago)

Author:

lmdzadmin

Message:

Prise en compte du fichier de trait de cote (si il existe) et du masque
correspondant dans les parametrisation de FLott
LF

File:

• LMDZ.3.3/branches/rel-LF/libf/dyn3d/startvar.F (modified) (5 diffs)

LMDZ.3.3/branches/rel-LF/libf/dyn3d/startvar.F

@@ -72 +72 @@
     !
       SUBROUTINE startget_phys2d(varname, iml, jml, lon_in, lat_in,
-     . champ, val_exp, jml2, lon_in2, lat_in2 , interbar )
+     . champ, val_exp, jml2, lon_in2, lat_in2 , interbar, masque_lu )
     !
     !    There is a big mess with the size in logitude, should it be iml or iml+1.
@@ -86 +86 @@
       REAL, INTENT(inout) :: champ(iml,jml)
       REAL, INTENT(in) :: val_exp
+      REAL, INTENT(in), optional :: masque_lu(iml,jml) 
       LOGICAL interbar
     !
@@ -101 +102 @@
                   IF ( .NOT.ALLOCATED(relief)) THEN
                       !
+                    if (present(masque_lu)) then
                       CALL start_init_orog( iml, jml, lon_in, lat_in,
-     .                    jml2,lon_in2,lat_in2, interbar )
+     .                    jml2,lon_in2,lat_in2, interbar, masque_lu )
+                    else
+                      CALL start_init_orog( iml, jml, lon_in, lat_in,
+     .                    jml2,lon_in2,lat_in2, interbar)
+                    endif
                       !
                   ENDIF
@@ -241 +247 @@
     !
       SUBROUTINE start_init_orog ( iml,jml,lon_in, lat_in,jml2,lon_in2 ,
-     ,   lat_in2 , interbar )
+     ,   lat_in2 , interbar, masque_lu )
     !
       INTEGER, INTENT(in) :: iml, jml, jml2
       REAL, INTENT(in) :: lon_in(iml), lat_in(jml)
       REAL, INTENT(in) :: lon_in2(iml), lat_in2(jml2)
+      REAL, intent(in), optional :: masque_lu(iml,jml)
       LOGICAL interbar
     !
@@ -339 +346 @@
       ALLOCATE(tmp_int(iml,jml))
       ALLOCATE(masque(iml,jml))
+
+      masque = -99999.
+      if (present(masque_lu)) then
+        masque = masque_lu
+      endif
     !
       CALL grid_noro(iml_rel, jml_rel, lon_rad, lat_rad, relief_hi,