Changeset 3785 for palm/trunk/UTIL/inifor/src/inifor_grid.f90

Timestamp:

Mar 6, 2019 10:41:14 AM (5 years ago)

Author:

eckhard

Message:

inifor: Removed unused variables, improved coding style

File:

• palm/trunk/UTIL/inifor/src/inifor_grid.f90 (modified) (31 diffs)

palm/trunk/UTIL/inifor/src/inifor_grid.f90

@@ -440 +440 @@
                     "has not been implemented, yet."
           CALL inifor_abort('setup_parameters', message)
-       END IF
+       ENDIF
 
 !
@@ -525 +525 @@
                                   // TRIM(cfg % namelist_file) // "'"
 
-       END IF
+       ENDIF
        origin_lon = origin_lon * TO_RADIANS
        origin_lat = origin_lat * TO_RADIANS
@@ -566 +566 @@
           hfl(:,:,k) = 0.5_dp * ( hhl(:,:,k) +                                 &
                                   hhl(:,:,k+1) )
-       END DO
+       ENDDO
  CALL run_control('time', 'comp')
 
@@ -1041 +1041 @@
                   x0=x0, y0=y0, z0 = z0,                                          &
                   nx = nx, ny = ny, nz = nlev - 1)
-       END IF
+       ENDIF
 
 !                                                                              
@@ -1117 +1117 @@
           CALL setup_interpolation(cosmo_grid, scalars_south_grid, scalars_south_intermediate, interp_mode)
           CALL setup_interpolation(cosmo_grid, scalars_top_grid, scalars_top_intermediate, interp_mode)
-       END IF
+       ENDIF
 
        interp_mode = 'u'
@@ -1127 +1127 @@
           CALL setup_interpolation(cosmo_grid, u_south_grid, u_south_intermediate, interp_mode)
           CALL setup_interpolation(cosmo_grid, u_top_grid, u_top_intermediate, interp_mode)
-       END IF
+       ENDIF
 
        interp_mode = 'v'
@@ -1137 +1137 @@
           CALL setup_interpolation(cosmo_grid, v_south_grid, v_south_intermediate, interp_mode)
           CALL setup_interpolation(cosmo_grid, v_top_grid, v_top_intermediate, interp_mode)
-       END IF
+       ENDIF
 
        interp_mode = 'w'
@@ -1147 +1147 @@
           CALL setup_interpolation(cosmo_grid, w_south_grid, w_south_intermediate, interp_mode)
           CALL setup_interpolation(cosmo_grid, w_top_grid, w_top_intermediate, interp_mode)
-       END IF
+       ENDIF
 
        IF (TRIM(cfg % ic_mode) == 'profile')  THEN
            !TODO: remove this conditional if not needed. 
-       END IF
+       ENDIF
         
 
@@ -1241 +1241 @@
        IF (PRESENT(ic_mode))  THEN
           IF (TRIM(ic_mode) == 'profile')  setup_volumetric = .FALSE.
-       END IF
+       ENDIF
 
        IF (setup_volumetric)  THEN
@@ -1254 +1254 @@
           CALL interpolate_2d(cosmo_h, intermediate_grid % h, intermediate_grid)
           CALL find_vertical_neighbours_and_weights_interp(grid, intermediate_grid)
-       END IF
+       ENDIF
        
     END SUBROUTINE setup_interpolation
@@ -1317 +1317 @@
               message = "z has not been passed but is required for 'boundary' grids"
               CALL inifor_abort('init_grid_definition', message)
-           END IF
+           ENDIF
 
            ALLOCATE( grid % x(0:nx) )
@@ -1335 +1335 @@
               ALLOCATE( grid % w_verti(0:nx, 0:ny, 1:nz, 2) )
               grid % w_verti(:,:,:,:) = 0.0_dp
-           END IF
+           ENDIF
         
         CASE('boundary intermediate')
@@ -1374 +1374 @@
               message = "z has not been passed but is required for 'palm' grids"
               CALL inifor_abort('init_grid_definition', message)
-           END IF
+           ENDIF
 
            IF (.NOT.PRESENT(zw))  THEN
               message = "zw has not been passed but is required for 'palm' grids"
               CALL inifor_abort('init_grid_definition', message)
-           END IF
+           ENDIF
 
            grid % name(1) = 'x and lon'
@@ -1407 +1407 @@
               ALLOCATE( grid % w_verti(0:nx, 0:ny, 1:nz, 2) )
               grid % w_verti(:,:,:,:) = 0.0_dp
-           END IF
+           ENDIF
 
         CASE('palm intermediate')
@@ -1602 +1602 @@
                           avg_grid % iii, avg_grid % jjj)
 
-       END IF
+       ENDIF
 
 !
@@ -1674 +1674 @@
           avg_grid % iii(l) = i
           avg_grid % jjj(l) = j
-       END DO
-       END DO
+       ENDDO
+       ENDDO
 
     END SUBROUTINE get_cosmo_averaging_region
@@ -2083 +2083 @@
         DO k = 1, UBOUND(zw, 1)
            zw(k) = 0.5_dp * (z(k-1) + z(k))
-        END DO
+        ENDDO
 
     END SUBROUTINE midpoints
@@ -2291 +2291 @@
        ELSE
           group % n_output_quantities = group % n_inputs
-       END IF
+       ENDIF
 
        ALLOCATE(group % in_var_list(group % n_inputs))
@@ -2347 +2347 @@
           message = 'Simulation start date has not been set.'
           CALL inifor_abort('setup_variable_tables', message)
-       END IF
+       ENDIF
 
        nc_source_text = 'COSMO-DE analysis from ' // TRIM(cfg % start_date)
@@ -2491 +2491 @@
        IF (TRIM(ic_mode) == 'profile')  THEN
           output_var_table(3) % averaging_grid => averaged_initial_scalar_profile
-       END IF
+       ENDIF
 
        output_var_table(4) = init_nc_var(                                      &
@@ -2567 +2567 @@
        IF (TRIM(ic_mode) == 'profile')  THEN
           output_var_table(9) % averaging_grid => averaged_initial_scalar_profile
-       END IF
+       ENDIF
 
        output_var_table(10) = init_nc_var(                                     &
@@ -2643 +2643 @@
        IF (TRIM(ic_mode) == 'profile')  THEN
           output_var_table(15) % averaging_grid => averaged_initial_scalar_profile
-       END IF 
+       ENDIF 
 
        output_var_table(16) = init_nc_var(                                     &
@@ -2719 +2719 @@
        IF (TRIM(ic_mode) == 'profile')  THEN
           output_var_table(21) % averaging_grid => averaged_initial_scalar_profile
-       END IF
+       ENDIF
 
        output_var_table(22) = init_nc_var(                                     &
@@ -2795 +2795 @@
        IF (TRIM(ic_mode) == 'profile')  THEN
           output_var_table(27) % averaging_grid => averaged_initial_w_profile
-       END IF
+       ENDIF
 
        output_var_table(28) = init_nc_var(                                     &
@@ -3315 +3315 @@
        IF (PRESENT(is_profile))  THEN
           IF (is_profile)  out_var_kind = TRIM(kind) // ' profile'
-       END IF
+       ENDIF
 
        var % name              = name
@@ -3734 +3734 @@
                                u = input_buffer(1) % array(i,j,k),             &
                                v = input_buffer(2) % array(i,j,k) )
-             END DO
-             END DO
-             END DO
+             ENDDO
+             ENDDO
+             ENDDO
 
           CASE DEFAULT
@@ -3788 +3788 @@
                    basic_state_pressure(:)
 
-             END DO
-             END DO
+             ENDDO
+             ENDDO
  CALL run_control('time', 'comp')
 
@@ -3797 +3797 @@
              group % in_var_list(2) % name = 'P'
 
-          END IF
+          ENDIF
 !
 !--       mark pressure as preprocessed
@@ -3875 +3875 @@
              input_buffer(1) % array(i,j,k) =                                  &
                  input_buffer(1) % array(i,j,k) * d_depth_rho_inv(k)
-          END DO
-          END DO
-          END DO
+          ENDDO
+          ENDDO
+          ENDDO
 
           message = "Converted soil water from [kg/m^2] to [m^3/m^3]"
@@ -4054 +4054 @@
                       n_cells = n_cells + 1
                       column(:) = column(:) + array(ii,jj,:)
-                   END IF
-
-                END DO
+                   ENDIF
+
+                ENDDO
 
 !
@@ -4063 +4063 @@
                    array(i,j,:) = column(:) / n_cells
                    new_soiltyp(i,j) = 0
-                END IF
-
-             END IF
-
-          END DO
-          END DO
+                ENDIF
+
+             ENDIF
+
+          ENDDO
+          ENDDO
 
           old_soiltyp(:,:) = new_soiltyp(:,:)
 
-       END DO
+       ENDDO
 
        DEALLOCATE(old_soiltyp, new_soiltyp)