Changeset 4280 for palm/trunk/SOURCE/netcdf_data_input_mod.f90

Timestamp:

Oct 29, 2019 2:34:15 PM (5 years ago)

Author:

monakurppa

Message:

Correct recent bugs in salsa_mod and remove chemistry specific stuff in netcdf_data_iput_mod

• A boundary conditions bug in salsa_mod: set top boundary to its default value (neumann) if nesting is turned off
• In salsa_nesting_offl_bc, correct fac_dt to apply time_utc_init
• Remove chemistry specific parts (inside an if clause id==id_emis) in get_variable_4d_to_3d_real and get_variable_5d_to_4d_real

File:

• palm/trunk/SOURCE/netcdf_data_input_mod.f90 (modified) (6 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Remove id_emis flags from get_variable_4d_to_3d_real and
+! get_variable_5d_to_4d_real
+! 
+! 4258 2019-10-07 13:29:08Z suehring
 ! - Migrate input of soil temperature and moisture to land-surface model.
 ! - Remove interpolate routines and move the only required subroutine to 
@@ -5233 +5237 @@
        CHARACTER(LEN=*)              ::  variable_name   !< variable name
 
-       INTEGER(iwp)                  ::  ns              !< start index for subdomain input along n dimension: ns coincides here with ne, since, we select only one value along the 1st dimension n
-
        INTEGER(iwp)                  ::  i               !< index along x direction
        INTEGER(iwp)                  ::  ie              !< end index for subdomain input along x direction
@@ -5246 +5248 @@
        INTEGER(iwp)                  ::  ke              !< end index of 4th dimension
        INTEGER(iwp)                  ::  ks              !< start index of 4th dimension
-       
+       INTEGER(iwp)                  ::  ns              !< start index for subdomain input along n dimension
+
        REAL(wp), DIMENSION(:,:,:), ALLOCATABLE   ::  tmp !< temporary variable to read data from file according 
                                                          !< to its reverse memory access
 
-       REAL(wp), DIMENSION(:,:,:), INTENT(INOUT) ::  var  !< variable where the read data have to be stored: one dimension is reduced in the process
+       REAL(wp), DIMENSION(:,:,:), INTENT(INOUT) ::  var  !< variable where the read data have to be stored: 
+                                                          !< one dimension is reduced in the process
 #if defined( __netcdf )
 
 !
 !--    Inquire variable id
-       nc_stat = NF90_INQ_VARID( id, TRIM( variable_name ), id_var )  
+       nc_stat = NF90_INQ_VARID( id, TRIM( variable_name ), id_var )
 !
 !--    Check for collective read-operation and set respective NetCDF flags if
@@ -5262 +5266 @@
           nc_stat = NF90_VAR_PAR_ACCESS (id, id_var, NF90_COLLECTIVE)
        ENDIF
-
-      !Temporary solution for reading emission chemistry files: 
-       IF ( id == id_emis ) THEN
-
-          !--    Allocate temporary variable according to memory access on file. 
-          ALLOCATE( tmp(is:ie,js:je,ks:ke) )
-
-          !--    Get variable
-          nc_stat = NF90_GET_VAR( id, id_var, tmp(is:ie,js:je,ks:ke),                                &
-                                  start = (/ ns, is,   js+1,   ks+1 /),                  &
-                                  count = (/ 1, ie-is+1 , je-js+1, ke-ks+1 /) ) 
-
-          var=tmp(:,:,:)
-
-          CALL handle_error( 'get_variable_4d_to_3d_real', 536, variable_name )
- 
-          DEALLOCATE( tmp )
-
-       ELSE
-!
-!--       Allocate temporary variable according to memory access on file. 
-          ALLOCATE( tmp(is:ie,js:je,ks:ke) )
-!
-!--       Get variable
-          nc_stat = NF90_GET_VAR( id, id_var, tmp,                             &
-                                  start = (/ is+1,    js+1,    ks+1,   ns+1 /),&
-                                  count = (/ ie-is+1, je-js+1, ke-ks+1, 1   /) )
-
-          CALL handle_error( 'get_variable_4d_to_3d_real', 536, variable_name )
-!
-!--       Resort data. Please note, dimension subscripts of var all start at 1.
-          DO  i = is, ie
-             DO  j = js, je
-                DO  k = ks, ke
-                   var(k-ks+1,j-js+1,i-is+1) = tmp(i,j,k)
-                ENDDO
+!
+!--    Allocate temporary variable according to memory access on file. 
+       ALLOCATE( tmp(is:ie,js:je,ks:ke) )
+!
+!--    Get variable
+       nc_stat = NF90_GET_VAR( id, id_var, tmp,                                &
+                               start = (/ is+1,    js+1,    ks+1,   ns+1 /),   &
+                               count = (/ ie-is+1, je-js+1, ke-ks+1, 1   /) )
+
+       CALL handle_error( 'get_variable_4d_to_3d_real', 536, variable_name )
+!
+!--    Resort data. Please note, dimension subscripts of var all start at 1.
+       DO  i = is, ie
+          DO  j = js, je
+             DO  k = ks, ke
+                var(k-ks+1,j-js+1,i-is+1) = tmp(i,j,k)
              ENDDO
           ENDDO
-
-         DEALLOCATE( tmp )
-
-       ENDIF
+       ENDDO
+
+      DEALLOCATE( tmp )
+
 #endif
     END SUBROUTINE get_variable_4d_to_3d_real
@@ -5435 +5419 @@
        INTEGER(iwp)                  ::  ke              !< end index of 5th dimension
        INTEGER(iwp)                  ::  ks              !< start index of 5th dimension
-       
+
        REAL(wp), DIMENSION(:,:,:,:), ALLOCATABLE   ::  tmp !< temporary variable to read data from file according 
                                                            ! to its reverse memory access
@@ -5449 +5433 @@
           nc_stat = NF90_VAR_PAR_ACCESS (id, id_var, NF90_COLLECTIVE)
        ENDIF
-
-      !Temporary solution for reading emission chemistry files: 
-       IF ( id == id_emis ) THEN
-
-          !--    Allocate temporary variable according to memory access on file. 
-          ALLOCATE( tmp(ts:te,1,js+1:je+1,ks+1:ke+1) )
-
-          !--    Get variable
-          nc_stat = NF90_GET_VAR( id, id_var, tmp(ts:te,1,js+1:je+1,ks+1:ke+1),               &
-                                  start = (/ ns, ts,  1,   js+1,   ks+1 /),                  &
-                                  count = (/ 1, te-ts+1, 1, je-js+1, ke-ks+1 /) ) 
-
-          var=tmp
-
-          CALL handle_error( 'get_variable_5d_to_4d_real', 538, variable_name )
- 
-          DEALLOCATE( tmp )
-
-       !>  Original Subroutine part
-       ELSE
 !
 !--    Allocate temporary variable according to memory access on file. 
-          ALLOCATE( tmp(ks:ke,js:je,is:is,ts:te) )
+       ALLOCATE( tmp(ks:ke,js:je,is:is,ts:te) )
 !
 !--    Get variable
-          nc_stat = NF90_GET_VAR( id, id_var, tmp,                                &
-                                  start = (/ ks+1, js+1, is+1, ts+1, ns /),           &
-                                  count = (/ ke-ks+1, je-js+1, ie-is+1, te-ts+1, 1 /) )   
-                               
-          CALL handle_error( 'get_variable_5d_to_4d_real', 538, variable_name )
-!
-!--    Resort data. Please note, dimension subscripts of var all start at 1. 
-
-          DO  t = ts, te 
-             DO  i = is, ie 
-                DO  j = js, je
-                   DO  k = ks, ke
-                      var(t-ts+1,i-is+1,j-js+1,k-ks+1) = tmp(k,j,i,t)
-                   ENDDO
+       nc_stat = NF90_GET_VAR( id, id_var, tmp,                                &
+                               start = (/ ks+1, js+1, is+1, ts+1, ns /),       &
+                               count = (/ ke-ks+1, je-js+1, ie-is+1, te-ts+1, 1 /) )
+
+       CALL handle_error( 'get_variable_5d_to_4d_real', 538, variable_name )
+!
+!--    Resort data. Please note, dimension subscripts of var all start at 1.
+
+       DO  t = ts, te 
+          DO  i = is, ie 
+             DO  j = js, je
+                DO  k = ks, ke
+                   var(t-ts+1,i-is+1,j-js+1,k-ks+1) = tmp(k,j,i,t)
                 ENDDO
              ENDDO
-          ENDDO 
-
-          DEALLOCATE( tmp )
-
-       ENDIF
+          ENDDO
+       ENDDO 
+
+       DEALLOCATE( tmp )
 #endif
     END SUBROUTINE get_variable_5d_to_4d_real