real conversion in wind interpolation

flash2d/src/options-sphere/ADV_wind_stacked.f90

@@ -209,12 +209,9 @@
       INTEGER (KIND = GRID_SI)               :: i_filexid, i_fileyid, i_filezid
       INTEGER (KIND = GRID_SI)               :: i_dimid, i_varid
       INTEGER (KIND = GRID_SI)               :: i_tm, i_ln, i_lt, i_ly
-!       REAL (KIND = GRID_SR), DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxx
-!       REAL (KIND = GRID_SR), DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxy
-!       REAL (KIND = GRID_SR), DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxz
-      REAL*4, DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxx
-      REAL*4, DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxy
-      REAL*4, DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxz
+      REAL (KIND = GRID_SR), DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxx
+      REAL (KIND = GRID_SR), DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxy
+      REAL (KIND = GRID_SR), DIMENSION(:,:,:,:), ALLOCATABLE :: r_auxz
 
 !---------- initialize file names
       WRITE(GRID_parameters%ioout,*) &
@@ -431,9 +428,12 @@
       WRITE(GRID_parameters%ioout,*) &
         '***** reshaping core data arrays ...                  *****'
 
-      r_flowx = reshape(r_auxx, shape(r_flowx), order=(/4,3,2,1/))
-      r_flowy = reshape(r_auxy, shape(r_flowy), order=(/4,3,2,1/))
-      r_flowz = reshape(r_auxz, shape(r_flowz), order=(/4,3,2,1/))
+!       r_flowx = reshape(r_auxx, shape(r_flowx), order=(/4,3,2,1/))
+!       r_flowy = reshape(r_auxy, shape(r_flowy), order=(/4,3,2,1/))
+!       r_flowz = reshape(r_auxz, shape(r_flowz), order=(/4,3,2,1/))
+      r_flowx = r_auxx
+      r_flowy = r_auxy
+      r_flowz = r_auxz
       DEALLOCATE(r_auxx, r_auxy, r_auxz)
 
 !---------- Fix mask values
@@ -556,19 +556,19 @@
 
       IF(r_dx /= 0.0_GRID_SR) THEN
         r_dxi= 1._GRID_SR/r_dx
-        r_l1= (r_hx* r_flowx(i_lox, i_loy, i_layer, i_tim)+ &
-               r_lx* r_flowx(i_hix, i_loy, i_layer, i_tim))* r_dxi
-        r_h1= (r_hx* r_flowx(i_lox, i_hiy, i_layer, i_tim)+ &
-               r_lx* r_flowx(i_hix, i_hiy, i_layer, i_tim))* r_dxi
-        r_l2= (r_hx* r_flowy(i_lox, i_loy, i_layer, i_tim)+ &
-               r_lx* r_flowy(i_hix, i_loy, i_layer, i_tim))* r_dxi
-        r_h2= (r_hx* r_flowy(i_lox, i_hiy, i_layer, i_tim)+ &
-               r_lx* r_flowy(i_hix, i_hiy, i_layer, i_tim))* r_dxi
+        r_l1= (r_hx* REAL(r_flowx(i_lox, i_loy, i_layer, i_tim),GRID_SR)+ &
+               r_lx* REAL(r_flowx(i_hix, i_loy, i_layer, i_tim),GRID_SR))* r_dxi
+        r_h1= (r_hx* REAL(r_flowx(i_lox, i_hiy, i_layer, i_tim),GRID_SR)+ &
+               r_lx* REAL(r_flowx(i_hix, i_hiy, i_layer, i_tim),GRID_SR))* r_dxi
+        r_l2= (r_hx* REAL(r_flowy(i_lox, i_loy, i_layer, i_tim),GRID_SR)+ &
+               r_lx* REAL(r_flowy(i_hix, i_loy, i_layer, i_tim),GRID_SR))* r_dxi
+        r_h2= (r_hx* REAL(r_flowy(i_lox, i_hiy, i_layer, i_tim),GRID_SR)+ &
+               r_lx* REAL(r_flowy(i_hix, i_hiy, i_layer, i_tim),GRID_SR))* r_dxi
       ELSE
-        r_l1= r_flowx(i_lox, i_loy, i_layer, i_tim)
-        r_h1= r_flowx(i_lox, i_hiy, i_layer, i_tim)
-        r_l2= r_flowy(i_lox, i_loy, i_layer, i_tim)
-        r_h2= r_flowy(i_lox, i_hiy, i_layer, i_tim)
+        r_l1= REAL(r_flowx(i_lox, i_loy, i_layer, i_tim),GRID_SR)
+        r_h1= REAL(r_flowx(i_lox, i_hiy, i_layer, i_tim),GRID_SR)
+        r_l2= REAL(r_flowy(i_lox, i_loy, i_layer, i_tim),GRID_SR)
+        r_h2= REAL(r_flowy(i_lox, i_hiy, i_layer, i_tim),GRID_SR)
       END IF
 
 !---------- linear interpolation in y-direction
@@ -662,13 +662,13 @@
 
       IF(r_dx /= 0.0_GRID_SR) THEN
         r_dxi= 1._GRID_SR/r_dx
-        r_l1= (r_hx* r_flowz(i_lox, i_loy, i_layer, i_tim)+ &
-               r_lx* r_flowz(i_hix, i_loy, i_layer, i_tim))* r_dxi
-        r_h1= (r_hx* r_flowz(i_lox, i_hiy, i_layer, i_tim)+ &
-               r_lx* r_flowz(i_hix, i_hiy, i_layer, i_tim))* r_dxi
+        r_l1= (r_hx* REAL(r_flowz(i_lox, i_loy, i_layer, i_tim),GRID_SR)+ &
+               r_lx* REAL(r_flowz(i_hix, i_loy, i_layer, i_tim),GRID_SR))* r_dxi
+        r_h1= (r_hx* REAL(r_flowz(i_lox, i_hiy, i_layer, i_tim),GRID_SR)+ &
+               r_lx* REAL(r_flowz(i_hix, i_hiy, i_layer, i_tim),GRID_SR))* r_dxi
       ELSE
-        r_l1= r_flowz(i_lox, i_loy, i_layer, i_tim)
-        r_h1= r_flowz(i_lox, i_hiy, i_layer, i_tim)
+        r_l1= REAL(r_flowz(i_lox, i_loy, i_layer, i_tim),GRID_SR)
+        r_h1= REAL(r_flowz(i_lox, i_hiy, i_layer, i_tim),GRID_SR)
       END IF
 
 !---------- linear interpolation in y-direction