Changeset 22 in lmdz_wrf

Timestamp:

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

Author:

lfita

Message:

Adding WRFmeas modifications in the WRF code side

Location:

branches/LMDZ_WRFmeas/WRFV3

Files:

• frame/module_domain.F (modified) (2 diffs)
• frame/module_domain_type.F (modified) (1 diff)
• share/Makefile (modified) (5 diffs)
• share/README.WRFmeas_lidar (added)
• share/input_wrf.F (modified) (1 diff)
• share/mediation_integrate.F (modified) (4 diffs)
• share/start_domain.F (modified) (2 diffs)
• share/wrf_lidar.F (added)
• share/wrf_lidarin.F (added)

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

branches/LMDZ_WRFmeas/WRFV3/share/Makefile

@@ -36 +36 @@
         output_wrf.o                    \
         wrf_timeseries.o                \
+        wrf_lidar.o                     \
         wrf_ext_write_field.o           \
         wrf_ext_read_field.o            \
@@ -42 +43 @@
         wrf_bdyin.o                     \
         wrf_tsin.o                      \
+        wrf_lidarin.o                   \
         landread.o                      \
         setfeenv.o
@@ -82 +84 @@
                 ../frame/module_wrf_error.o
 
-start_domain.o: start_domain_em.int wrf_timeseries.o ../frame/module_domain.o ../frame/module_configure.o
+start_domain.o: start_domain_em.int wrf_timeseries.o wrf_lidar.o ../frame/module_domain.o ../frame/module_configure.o
 
 module_bc.o: ../frame/module_configure.o ../frame/module_state_description.o \
@@ -109 +111 @@
 
 wrf_timeseries.o: wrf_tsin.o \
+                module_model_constants.o \
+                module_llxy.o \
+                ../frame/module_domain.o \
+                ../frame/module_configure.o \
+                ../frame/module_dm.o
+
+wrf_lidar.o: wrf_lidarin.o \
                 module_model_constants.o \
                 module_llxy.o \
@@ -293 +302 @@
                                 ../frame/module_configure.o ../frame/module_io.o module_io_wrf.o module_bc_time_utilities.o
 wrf_tsin.o                      : ../frame/module_domain.o
+wrf_lidarin.o                   : ../frame/module_domain.o
 
 

branches/LMDZ_WRFmeas/WRFV3/share/input_wrf.F

@@ -1287 +1287 @@
 #if (DA_CORE != 1)
     CALL wrf_tsin( grid , ierr )
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+    CALL wrf_lidarin( grid , ierr )
+#endif
 #endif
 

branches/LMDZ_WRFmeas/WRFV3/share/mediation_integrate.F

@@ -171 +171 @@
    ! Compute time series variables
    CALL calc_ts(grid)
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+    CALL calc_lidar(grid)
+#endif
 
    RETURN
@@ -349 +353 @@
         INTEGER, INTENT(INOUT) :: ierr
      END SUBROUTINE wrf_tsin
+
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+    SUBROUTINE wrf_lidarin ( grid , ierr )
+        USE module_domain
+        TYPE ( domain ), INTENT(INOUT) :: grid
+        INTEGER, INTENT(INOUT) :: ierr
+     END SUBROUTINE wrf_lidarin
+#endif
 
    END INTERFACE
@@ -467 +480 @@
        !   from the tslist file
        CALL wrf_tsin( nest , ierr )
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+       CALL wrf_lidarin( nest , ierr )
+#endif
 #endif
      END IF
@@ -1159 +1176 @@
    ! Write out time series
    CALL write_ts( grid )
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+   CALL write_lidar( grid )
+#endif
 
    RETURN

branches/LMDZ_WRFmeas/WRFV3/share/start_domain.F

@@ -27 +27 @@
          TYPE (domain) :: grid
       END SUBROUTINE calc_ts_locations
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+      SUBROUTINE calc_lidar_locations( grid )
+         USE module_domain
+         TYPE (domain) :: grid
+      END SUBROUTINE calc_lidar_locations
+#endif
 #endif
    END INTERFACE
@@ -56 +63 @@
 #if (DA_CORE != 1)
    CALL calc_ts_locations( grid )
+#if WRFMEAS
+! L. Fita, LMD. May 2014
+   CALL calc_lidar_locations( grid )
+#endif
 #endif