Changeset 585

Timestamp:

10/16/17 13:07:30 (7 years ago)

Author:

dubos

Message:

devel : reconstruct fluxes at cell centers

Location:

codes/icosagcm/devel/src

Files:

• diagnostics/diagflux.f90 (modified) (1 diff)
• diagnostics/wind.F90 (moved) (moved from codes/icosagcm/devel/src/diagnostics/wind.f90) (2 diffs)
• kernels/flux_centered.k90 (added)
• kernels/wind_centered.k90 (added)

codes/icosagcm/devel/src/diagnostics/diagflux.f90

@@ -37 +37 @@
     END DO
   END SUBROUTINE zero_qfluxt
+
+  SUBROUTINE flux_centered_lonlat(f_flux, f_flux_lon, f_flux_lat)
+    TYPE(t_field),POINTER :: f_flux(:), f_flux_lon(:), f_flux_lat(:)
+    REAL(rstd), POINTER :: flux(:,:,:), flux_lon(:,:,:), flux_lat(:,:,:)
+    INTEGER :: ind, itrac
+    DO ind=1,ndomain
+       IF (.NOT. assigned_domain(ind)) CYCLE
+       CALL swap_dimensions(ind)
+       CALL swap_geometry(ind)
+       flux=f_flux(ind)
+       DO itrac=1,nqtot
+          CALL compute_flux_centered_lonlat(flux(:,:,itrac), flux_lon(:,:,itrac), flux_lat(:,:,itrac))
+       END DO
+    END DO
+  END SUBROUTINE flux_centered_lonlat
   
+  SUBROUTINE compute_flux_centered_lonlat(flux, flux_lon, flux_lat)
+    REAL(rstd), INTENT(IN) :: flux(3*iim*jjm,llm)
+    REAL(rstd), INTENT(OUT) :: flux_lon(iim*jjm,llm), flux_lat(iim*jjm,llm)
+    REAL(rstd) :: flux_3d(iim*jjm,llm,3)
+    CALL compute_flux_centered(flux, flux_3d)
+    CALL compute_wind_centered_lonlat_compound(flux_3d, flux_lon, flux_lat)
+  END SUBROUTINE compute_flux_centered_lonlat
+
 END MODULE diagflux_mod

codes/icosagcm/devel/src/diagnostics/wind.F90

@@ -5 +5 @@
   PRIVATE
 
-  PUBLIC :: compute_wind_centered, compute_wind_centered_lonlat_compound, &
+  PUBLIC :: compute_wind_centered, compute_flux_centered, &
+       compute_wind_centered_lonlat_compound, compute_wind2d_perp_from_lonlat_compound, &
        compute_wind_centered_from_lonlat_compound, compute_wind_perp_from_lonlat_compound, &
-       un2ulonlat, ulonlat2un, compute_wind2d_perp_from_lonlat_compound
+       un2ulonlat, ulonlat2un
        
 CONTAINS
@@ -51 +52 @@
   REAL(rstd) :: ue(3*iim*jjm,llm)
   REAL(rstd) :: ucenter(iim*jjm,llm,3)
-  INTEGER :: i,j,ij,l    
- 
-    DO l=ll_begin,ll_end
-      DO j=jj_begin,jj_end
-        DO i=ii_begin,ii_end
-          ij=(j-1)*iim+i
-          ! Perot reconstruction based on Gauss' theorem
-          ! u = sum( u.edge_normal * edge_length * (edge_midpoint-cell_centroid) ) /cell_area
-          ucenter(ij,l,:)=1/Ai(ij)*                                                                                                &
-                        ( ne(ij,right)*ue(ij+u_right,l)*le(ij+u_right)*((xyz_v(ij+z_rdown,:)+xyz_v(ij+z_rup,:))/2-centroid(ij,:))  &
-                         + ne(ij,rup)*ue(ij+u_rup,l)*le(ij+u_rup)*((xyz_v(ij+z_rup,:)+xyz_v(ij+z_up,:))/2-centroid(ij,:))          &
-                         + ne(ij,lup)*ue(ij+u_lup,l)*le(ij+u_lup)*((xyz_v(ij+z_up,:)+xyz_v(ij+z_lup,:))/2-centroid(ij,:))          &
-                         + ne(ij,left)*ue(ij+u_left,l)*le(ij+u_left)*((xyz_v(ij+z_lup,:)+xyz_v(ij+z_ldown,:))/2-centroid(ij,:))    &
-                         + ne(ij,ldown)*ue(ij+u_ldown,l)*le(ij+u_ldown)*((xyz_v(ij+z_ldown,:)+xyz_v(ij+z_down,:))/2-centroid(ij,:))&
-                         + ne(ij,rdown)*ue(ij+u_rdown,l)*le(ij+u_rdown)*((xyz_v(ij+z_down,:)+xyz_v(ij+z_rdown,:))/2-centroid(ij,:)))
-        ENDDO
-      ENDDO
-    ENDDO
- 
+  INTEGER :: ij,l
+  REAL(rstd) :: ue_le, cx,cy,cz, ux,uy,uz
+#include "../kernels/wind_centered.k90"
  END SUBROUTINE compute_wind_centered
+ 
+  SUBROUTINE compute_flux_centered(ue,ucenter)
+  REAL(rstd) :: ue(3*iim*jjm,llm)
+  REAL(rstd) :: ucenter(iim*jjm,llm,3)
+  INTEGER :: ij,l
+  REAL(rstd) :: ue_le, cx,cy,cz, ux,uy,uz
+#include "../kernels/flux_centered.k90"
+  END SUBROUTINE compute_flux_centered