Changeset 22 in lmdz_wrf for branches/LMDZ_WRFmeas/WRFV3/frame

Timestamp:

Jul 18, 2014, 12:37:33 PM (11 years ago)

Author:

lfita

Message:

Adding WRFmeas modifications in the WRF code side

Location:

branches/LMDZ_WRFmeas/WRFV3/frame

Files:

• module_domain.F (modified) (2 diffs)
• module_domain_type.F (modified) (1 diff)

branches/LMDZ_WRFmeas/WRFV3/frame/module_domain.F

@@ -921 +921 @@
       grid%ntsloc        = 0
       grid%ntsloc_domain = 0
+
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+      ALLOCATE( grid%latlidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%lonlidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%namelidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%desclidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%ilidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%jlidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%id_lidarloc( grid%max_lidar_locs ) )
+      ALLOCATE( grid%lidar_filename( grid%max_lidar_locs ) )
+      grid%nlidarloc        = 0
+      grid%nlidarloc_domain = 0
+#endif
 
 #ifdef DM_PARALLEL
@@ -1592 +1606 @@
         DEALLOCATE( grid%ts_filename )
       ENDIF 
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+      IF ( ASSOCIATED( grid%ilidarloc ) ) THEN
+        DEALLOCATE( grid%ilidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%jlidarloc ) ) THEN
+        DEALLOCATE( grid%jlidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%id_lidarloc ) ) THEN
+        DEALLOCATE( grid%id_lidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%latlidarloc ) ) THEN
+        DEALLOCATE( grid%latlidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%lonlidarloc ) ) THEN
+        DEALLOCATE( grid%lonlidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%namelidarloc ) ) THEN
+        DEALLOCATE( grid%namelidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%desclidarloc ) ) THEN
+        DEALLOCATE( grid%desclidarloc )
+      ENDIF 
+      IF ( ASSOCIATED( grid%lidar_filename ) ) THEN
+        DEALLOCATE( grid%lidar_filename )
+      ENDIF 
+#endif
       DEALLOCATE( grid )
       NULLIFY( grid )

branches/LMDZ_WRFmeas/WRFV3/frame/module_domain_type.F

@@ -222 +222 @@
       LOGICAL :: have_displayed_alloc_stats   ! used in module_alloc_space to display alloc stats; only do it once.
 
+
+#ifdef WRFMEAS
+! L. Fita, LMD. May 2014
+      ! lidar location information
+      INTEGER :: nlidarloc, nlidarloc_domain
+      INTEGER :: next_lidar_time
+      INTEGER, POINTER, DIMENSION(:) :: ilidarloc, jlidarloc, id_lidarloc
+      REAL, POINTER, DIMENSION(:) :: latlidarloc, lonlidarloc
+      CHARACTER (LEN=5), POINTER, DIMENSION(:) :: namelidarloc
+      CHARACTER (LEN=25), POINTER, DIMENSION(:) :: desclidarloc
+      CHARACTER (LEN=256), POINTER, DIMENSION(:) :: lidar_filename
+      LOGICAL :: have_calculated_lidarlocs
+#endif
+
    END TYPE domain
 END MODULE module_domain_type