Changeset 958 for codes

Timestamp:

07/16/19 01:46:14 (5 years ago)

Author:

dubos

Message:

devel : vertical interpolation for unstructured mesh

Location:

codes/icosagcm/devel/src

Files:

• base/init_grid_param.f90 (modified) (3 diffs)
• diagnostics/compute_diagnostics.f90 (modified) (2 diffs)
• vertical/vertical_interp.f90 (modified) (4 diffs)

codes/icosagcm/devel/src/base/init_grid_param.f90

@@ -5 +5 @@
   USE compute_pression_mod
   USE compute_temperature_mod
+  USE vertical_interp_mod
 
   USE compute_caldyn_mod
@@ -71 +72 @@
     compute_temperature  => compute_temperature_hex
     compute_hydrostatic_pressure => compute_hydrostatic_pressure_hex
+    compute_vertical_interp => compute_vertical_interp_hex
     ! dynamics
     compute_pvort_only        => compute_pvort_only_hex
@@ -87 +89 @@
     compute_temperature  => compute_temperature_unst
     compute_hydrostatic_pressure => compute_hydrostatic_pressure_unst
+    compute_vertical_interp => compute_vertical_interp_unst
     ! dynamics
     compute_pvort_only         => compute_pvort_only_unst

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

@@ -39 +39 @@
     END SUBROUTINE comp_hydro_press
 
+    SUBROUTINE comp_vert_interp(pmid,in,out,pval)
+      IMPORT
+      REAL(rstd),INTENT(IN) :: pmid(iim_jjm_i, llm_)
+      REAL(rstd),INTENT(IN) :: in(iim_jjm_i, llm_)
+      REAL(rstd),INTENT(OUT):: out(iim_jjm_i)
+      REAL(rstd),INTENT(IN) :: pval
+    END SUBROUTINE comp_vert_interp
+
   END INTERFACE
 
@@ -45 +53 @@
   PROCEDURE(comp_temperature), POINTER :: compute_temperature => NULL()
   PROCEDURE(comp_hydro_press), POINTER :: compute_hydrostatic_pressure => NULL()
+  PROCEDURE(comp_vert_interp), POINTER :: compute_vertical_interp => NULL()
 
-  PUBLIC :: compute_rhodz, compute_pression, compute_pression_mid, compute_temperature, compute_hydrostatic_pressure
+  PUBLIC :: compute_rhodz, compute_pression, compute_pression_mid, compute_temperature, compute_hydrostatic_pressure, &
+       compute_vertical_interp
 
 END MODULE compute_diagnostics_mod

codes/icosagcm/devel/src/vertical/vertical_interp.f90

@@ -9 +9 @@
   
 
-  PUBLIC init_vertical_interp, vertical_interp, compute_vertical_interp
+  PUBLIC init_vertical_interp, vertical_interp, &
+       compute_vertical_interp_hex, compute_vertical_interp_unst
 
 CONTAINS
@@ -41 +42 @@
   END SUBROUTINE  vertical_interp
 
-  SUBROUTINE compute_vertical_interp(pmid,in,out,pval)
+  SUBROUTINE compute_vertical_interp_hex(pmid,in,out,pval)
     REAL(rstd),INTENT(IN) :: pmid(iim*jjm,llm)
     REAL(rstd),INTENT(IN) :: in(iim*jjm,llm)
-    REAL(rstd),INTENT(OUT) :: out(iim*jjm)
-    REAL(rstd) :: pval, coeff
-    INTEGER :: i,j,ij,l
+    REAL(rstd),INTENT(OUT):: out(iim*jjm)
+    REAL(rstd),INTENT(IN) :: pval
+    INTEGER :: i,j,ij
         
 !$OMP BARRIER    
@@ -54 +55 @@
         DO i=ii_begin-1,ii_end+1
           ij=(j-1)*iim+i
-          l=llm-1
-          DO WHILE(pmid(ij,l)<pval .AND. l>1)
-            l=l-1
-          ENDDO
-          coeff=(pval-pmid(ij,l))/(pmid(ij,l)-pmid(ij,l+1))
-          out(ij)=in(ij,l)+coeff*(in(ij,l)-in(ij,l+1))
+          CALL interp_1d(pmid(ij,:), in(ij,:), out(ij), pval)
         ENDDO
       ENDDO   
@@ -65 +61 @@
 !$OMP BARRIER
 
-  END SUBROUTINE compute_vertical_interp
+  END SUBROUTINE compute_vertical_interp_hex
+
+  SUBROUTINE compute_vertical_interp_unst(pmid,in,out,pval)
+    REAL(rstd),INTENT(IN) :: pmid(llm, primal_num)
+    REAL(rstd),INTENT(IN) :: in(llm, primal_num)
+    REAL(rstd),INTENT(OUT) :: out(primal_num)
+    REAL(rstd) :: pval
+    INTEGER :: ij        
+!$OMP BARRIER
+!$OMP MASTER
+    DO ij=1, primal_num
+       CALL interp_1d(pmid(:,ij), in(:,ij), out(ij), pval)
+    END DO
+!$OMP END MASTER
+!$OMP BARRIER
+  END SUBROUTINE compute_vertical_interp_unst
+
+  PURE SUBROUTINE interp_1d(pmid,in,out,pval)
+    REAL(rstd),INTENT(IN)  :: pmid(:)
+    REAL(rstd),INTENT(IN)  :: in(:)
+    REAL(rstd),INTENT(OUT) :: out
+    REAL(rstd),INTENT(IN)  :: pval
+    REAL(rstd) :: coeff
+    INTEGER :: l
+    l=llm-1
+    DO WHILE(pmid(l)<pval .AND. l>1)
+       l=l-1
+    END DO
+    coeff=(pval-pmid(l))/(pmid(l)-pmid(l+1))
+    out=in(l)+coeff*(in(l)-in(l+1))
+  END SUBROUTINE interp_1d
 
 END MODULE vertical_interp_mod