[Dart-dev] DART/branches Revision: 12422

[dart at ucar.edu]

hendric at ucar.edu
2018-03-05 10:03:49 -0700 (Mon, 05 Mar 2018)
97
removing all old references to dart_ind.  this has been
long replaced by get_dart_vector_index.




Modified: DART/branches/rma_static_data/models/wrf/model_mod.f90
===================================================================
--- DART/branches/rma_static_data/models/wrf/model_mod.f90	2018-03-02 15:10:03 UTC (rev 12421)
+++ DART/branches/rma_static_data/models/wrf/model_mod.f90	2018-03-05 17:03:49 UTC (rev 12422)
@@ -345,8 +345,6 @@
    character(len=10), dimension(:),pointer :: clamp_or_fail
    character(len=129),dimension(:),pointer :: description, units, stagger, coordinates
 
-   integer, dimension(:,:,:,:), pointer :: dart_ind
-
 end type wrf_static_data_for_dart
 
 type wrf_dom
@@ -628,7 +626,6 @@
 
 ! indices into 1D array - hopefully this becomes obsolete
 ! JPH changed last dimension here from num_model_var_types
-   !HK allocate(wrf%dom(id)%dart_ind(wrf%dom(id)%wes,wrf%dom(id)%sns,wrf%dom(id)%bts,wrf%dom(id)%number_of_wrf_variables))
 
 ! start and stop of each variable in vector
    allocate(wrf%dom(id)%var_index(2,wrf%dom(id)%number_of_wrf_variables))
@@ -642,10 +639,6 @@
 ! then just loop thru the table
 !---------------------------
 
-   !HK wrf%dom(id)%dart_ind = 0
-
-! NOTE: this could be put into the loop above if wrf%dom(id)%dart_ind is
-! eventually not needed
 ! Here we use ind instead of type as the 4th dimension.  In is linked to the
 ! specific type via wrf%dom(id)%var_index_list(ind).  This saves some
 ! space from the previous implementation but I am not yet sure of other
@@ -664,8 +657,6 @@
       do k=1,wrf%dom(id)%var_size(3,ind)
          do j=1,wrf%dom(id)%var_size(2,ind)
             do i=1,wrf%dom(id)%var_size(1,ind)
-               ! HK wrf%dom(id)%dart_ind(i,j,k,ind) &
-               !                               = dart_index
                dart_index = dart_index + 1
             enddo
          enddo
@@ -1764,7 +1755,7 @@
          ! and interpolate to desired horizontal location
 
          ! Hmmm, it does not appear that Rho is part of the DART state vector, so there
-         !   is not a reference to wrf%dom(id)%dart_ind -- we'll have to go right from
+         !   is not a reference to the DART state index -- we'll have to go right from
          !   the corner indices
 
          ! Interpolation for the Rho field at level k
@@ -1961,7 +1952,7 @@
                  print*, 'model_mod.f90 :: model_interpolate :: getCorners P rc = ', rc
          
             ! Hmmm, it does not appear that P is part of the DART state vector, so there
-            !   is not a reference to wrf%dom(id)%dart_ind -- we'll have to go right from
+            !   is not a reference to the DART state index -- we'll have to go right from
             !   the corner indices
 
             ! Interpolation for the P field at level k
@@ -2179,11 +2170,6 @@
 
                      if ( zloc(e) >= 1.0_r8 ) then  !  vertically interpolate
 
-!                     ugrid = (dx  * (x(wrf%dom(id)%dart_ind(ii1,  ii2,  k2,  wrf%dom(id)%type_u))  + &
-!                                     x(wrf%dom(id)%dart_ind(ii1+1,ii2,  k2,  wrf%dom(id)%type_u))) + &
-!                              dxm * (x(wrf%dom(id)%dart_ind(ii1,  ii2,  k2+1,wrf%dom(id)%type_u))  + &
-!                                     x(wrf%dom(id)%dart_ind(ii1+1,ii2,  k2+1,wrf%dom(id)%type_u)))) * 0.5_r8
-
                         ugrid_1 = get_dart_vector_index(ii1,  ii2,  k2,   domain_id(id), wrf%dom(id)%type_u)
                         ugrid_2 = get_dart_vector_index(ii1+1,ii2,  k2,   domain_id(id), wrf%dom(id)%type_u)
                         ugrid_3 = get_dart_vector_index(ii1,  ii2,  k2,   domain_id(id), wrf%dom(id)%type_u)
@@ -2206,18 +2192,10 @@
                         x_vgrid_3 = get_state(vgrid_3, state_handle)
                         x_vgrid_4 = get_state(vgrid_4, state_handle)
 
-!                     vgrid = (dx  * (x(wrf%dom(id)%dart_ind(ii1,  ii2,  k2,  wrf%dom(id)%type_v))  + &
-!                                     x(wrf%dom(id)%dart_ind(ii1,  ii2+1,k2,  wrf%dom(id)%type_v))) + &
-!                              dxm * (x(wrf%dom(id)%dart_ind(ii1,  ii2,  k2+1,wrf%dom(id)%type_v))  + &
-!                                     x(wrf%dom(id)%dart_ind(ii1,  ii2+1,k2+1,wrf%dom(id)%type_v)))) * 0.5_r8
-
                         vgrid = (dx  * (vgrid_1 + vgrid_2) + dxm * (vgrid_3 + vgrid_4)) * 0.5_r8
 
                      else  !  pressure level below ground.  Take model level 1 winds
 
-!                     ugrid = (x(wrf%dom(id)%dart_ind(ii1,  ii2,  1,wrf%dom(id)%type_u)) + &
-!                              x(wrf%dom(id)%dart_ind(ii1+1,ii2,  1,wrf%dom(id)%type_u))) * 0.5_r8
-
                         ugrid_1 = get_dart_vector_index(ii1,  ii2,  1, domain_id(id),wrf%dom(id)%type_u)
                         ugrid_2 = get_dart_vector_index(ii1+1,ii2,  1, domain_id(id),wrf%dom(id)%type_u)
 
@@ -2226,9 +2204,6 @@
  
                         ugrid = (x_ugrid_1 + x_ugrid_2) * 0.5_r8
 
-!                     vgrid = (x(wrf%dom(id)%dart_ind(ii1,  ii2,  1,wrf%dom(id)%type_v)) + &
-!                              x(wrf%dom(id)%dart_ind(ii1,  ii2+1,1,wrf%dom(id)%type_v))) * 0.5_r8
-
                         vgrid_1 = get_dart_vector_index(ii1,  ii2,  1, domain_id(id),wrf%dom(id)%type_v)
                         vgrid_2 = get_dart_vector_index(ii1,  ii2+1,1, domain_id(id),wrf%dom(id)%type_v)
 
@@ -2400,20 +2375,15 @@