Changeset 14212

Timestamp:

2020-12-18T12:19:49+01:00 (3 years ago)

Author:

jchanut

Message:

#2222, update PPR library to circumvent issues found with cpp directives: remove timing instructions. Changed main module extension in .F90 to comply with FCM rules (no effect).

Location:

vendors/PPR/src

Files:

• bfun1d.h90 (modified) (1 diff)
• ffsl1d.h90 (modified) (1 diff)
• inv.h90 (modified) (1 diff)
• oscl1d.h90 (modified) (1 diff)
• p1e.h90 (modified) (1 diff)
• p3e.h90 (modified) (1 diff)
• p5e.h90 (modified) (1 diff)
• pbc.h90 (modified) (1 diff)
• pcm.h90 (modified) (1 diff)
• plm.h90 (modified) (1 diff)
• ppm.h90 (modified) (2 diffs)
• ppr_1d.F90 (added)
• ppr_1d.f90 (deleted)
• pqm.h90 (modified) (1 diff)
• rcon1d.h90 (modified) (5 diffs)
• rmap1d.h90 (modified) (4 diffs)
• root1d.h90 (modified) (1 diff)
• util1d.h90 (modified) (1 diff)
• weno1d.h90 (modified) (1 diff)

vendors/PPR/src/bfun1d.h90

@@ -28 +28 @@
 
     !    
-    ! BFUN1D.f90: poly. basis-functions for reconstruction.
+    ! BFUN1D.h90: poly. basis-functions for reconstruction.
     !
     ! Darren Engwirda 

vendors/PPR/src/ffsl1d.h90

@@ -28 +28 @@
 
     !    
-    ! FFSL1D.f90: upwind-biased flux-reconstruction scheme.
+    ! FFSL1D.h90: upwind-biased flux-reconstruction scheme.
     !
     ! Darren Engwirda 

vendors/PPR/src/inv.h90

@@ -28 +28 @@
 
     !    
-    ! INV.f90: block-wise solution of small linear systems.
+    ! INV.h90: block-wise solution of small linear systems.
     !
     ! Darren Engwirda 

vendors/PPR/src/oscl1d.h90

@@ -28 +28 @@
 
     !    
-    ! OSCL1D.f90: "oscillation-indicators" for WENO interp.
+    ! OSCL1D.h90: "oscillation-indicators" for WENO interp.
     !
     ! Darren Engwirda 

vendors/PPR/src/p1e.h90

@@ -28 +28 @@
 
     !    
-    ! P1E.f90: set edge estimates via degree-1 polynomials.
+    ! P1E.h90: set edge estimates via degree-1 polynomials.
     !
     ! Darren Engwirda 

vendors/PPR/src/p3e.h90

@@ -28 +28 @@
 
     !    
-    ! P3E.f90: set edge estimates via degree-3 polynomials.
+    ! P3E.h90: set edge estimates via degree-3 polynomials.
     !
     ! Darren Engwirda 

vendors/PPR/src/p5e.h90

@@ -28 +28 @@
 
     !    
-    ! P5E.f90: set edge estimates via degree-5 polynomials.
+    ! P5E.h90: set edge estimates via degree-5 polynomials.
     !
     ! Darren Engwirda 

vendors/PPR/src/pbc.h90

@@ -28 +28 @@
 
     !    
-    ! PBC.f90: setup polynomial B.C.'s at domain endpoints.
+    ! PBC.h90: setup polynomial B.C.'s at domain endpoints.
     !
     ! Darren Engwirda 

vendors/PPR/src/pcm.h90

@@ -28 +28 @@
 
     !    
-    ! PCM.f90: 1d piecewise constant reconstruction .
+    ! PCM.h90: 1d piecewise constant reconstruction .
     !
     ! Darren Engwirda 

vendors/PPR/src/plm.h90

@@ -28 +28 @@
 
     !    
-    ! PLM.f90: a 1d, slope-limited piecewise linear method.
+    ! PLM.h90: a 1d, slope-limited piecewise linear method.
     !
     ! Darren Engwirda 

vendors/PPR/src/ppm.h90

@@ -28 +28 @@
 
     !    
-    ! PPM.f90: 1d slope-limited, piecewise parabolic recon.
+    ! PPM.h90: 1d slope-limited, piecewise parabolic recon.
     !
     ! Darren Engwirda 
@@ -45 +45 @@
         &               fdat,fhat,edge,oscl, &
         &               dmin,ilim,wlim,halo)
-
 
     !

vendors/PPR/src/pqm.h90

@@ -28 +28 @@
 
     !    
-    ! PQM.f90: a 1d slope-limited, piecewise quartic recon.
+    ! PQM.h90: a 1d slope-limited, piecewise quartic recon.
     !
     ! Darren Engwirda 

vendors/PPR/src/rcon1d.h90

@@ -28 +28 @@
 
     !    
-    ! RCON1D.f90: conservative, polynomial reconstructions.
+    ! RCON1D.h90: conservative, polynomial reconstructions.
     !
     ! Darren Engwirda 
@@ -102 +102 @@
     !-------------------------- compute edge values/slopes !
 
-        __TIC__
 
         if ( (opts%cell_meth.eq.ppm_method) &
@@ -142 +141 @@
         end if
         
-        __TOC__(tCPU,edge_time)
 
     !-------------------------- compute oscil. derivatives !
 
-        __TIC__
 
         if (opts%cell_lims.eq.weno_limit) then
@@ -157 +154 @@
         end if
     
-        __TOC__(time,oscl_time)
 
     !-------------------------- compute grid-cell profiles !
 
-        __TIC__
 
         select case (opts%cell_meth)
@@ -201 +196 @@
         end select
 
-        __TOC__(tCPU,cell_time)
 
     end subroutine

vendors/PPR/src/rmap1d.h90

@@ -28 +28 @@
 
     !    
-    ! RMAP1D.f90: high-order integral re-mapping operators.
+    ! RMAP1D.h90: high-order integral re-mapping operators.
     !
     ! Darren Engwirda 
@@ -148 +148 @@
     !------------- remap FDAT from XPOS to XNEW using FHAT !
 
-        __TIC__
 
         select case(opts%cell_meth)
@@ -185 +184 @@
         end select
         
-        __TOC__(tCPU,rmap_time)
         
         return
@@ -245 +243 @@
         integer, parameter :: INTB = -1   ! integral basis  
 
+    !------------------------------------- initializations !
+
+        vvlo(+1:+5) = 0.d0
+        vvhi(+1:+5) = 0.d0
+
     !------------- remap FDAT from XPOS to XNEW using FHAT !
 

vendors/PPR/src/root1d.h90

@@ -28 +28 @@
 
     !    
-    ! ROOT1D.f90: find the "roots" of degree-k polynomials.
+    ! ROOT1D.h90: find the "roots" of degree-k polynomials.
     !
     ! Darren Engwirda 

vendors/PPR/src/util1d.h90

@@ -28 +28 @@
 
     !    
-    ! UTIL1D.f90: util. func. for 1-dim. grid manipulation.
+    ! UTIL1D.h90: util. func. for 1-dim. grid manipulation.
     !
     ! Darren Engwirda 

vendors/PPR/src/weno1d.h90

@@ -28 +28 @@
 
     !    
-    ! WENO1D.f90: WENO-style slope-limiting for 1d reconst.
+    ! WENO1D.h90: WENO-style slope-limiting for 1d reconst.
     !
     ! Darren Engwirda