Changeset 14789 for NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/NST/vremap.F90

Timestamp:

2021-05-05T13:18:04+02:00 (3 years ago)

Author:

mcastril

Message:

[2021/HPC-11_mcastril_HPDAonline_DiagGPU] Update externals

Location:

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU

Files:

• . (modified) (1 prop)
• src/NST/vremap.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette

NEMO/branches/2021/dev_r13747_HPC-11_mcastril_HPDAonline_DiagGPU/src/NST/vremap.F90

@@ -1 @@
-#undef PPR_LIB      /* USE PPR library */
+#define PPR_LIB      /* USE PPR library */
 MODULE vremap
 !$AGRIF_DO_NOT_TREAT
@@ -320 +320 @@
       ! specify methods
 !      opts%edge_meth = p1e_method     ! 1st-order edge interp.
+!      opts%cell_meth = pcm_method
 !      opts%cell_meth = plm_method     ! PLM method in cells
       opts%edge_meth = p3e_method     ! 3rd-order edge interp.
@@ -328 +329 @@
       ! limiter
 !      opts%cell_lims = null_limit     ! no lim.
+!      opts%cell_lims = weno_limit
       opts%cell_lims = mono_limit     ! monotone limiter   
  
@@ -376 +378 @@
       DO jkout = 1, kjpk_out !  Loop over destination grid
          !
-         IF     ( pzout(jkout) <=  pzin(  1    ) ) THEN  ; ptout(jkout,1:kn_var) = ptin(    1    ,1:kn_var)         
-         ELSEIF ( pzout(jkout) >= pzin(kjpk_in) ) THEN   ; ptout(jkout,1:kn_var) = ptin( kjpk_in ,1:kn_var)
+         IF     ( pzout(jkout) <=  pzin(  1    ) ) THEN ! Surface extrapolation  
+            DO jn = 1, kn_var 
+! linear
+!               ptout(jkout,jn) = ptin(1 ,jn) + &
+!                               & (pzout(jkout) - pzin(1)) / (pzin(2)    - pzin(1)) &
+!                               &                          * (ptin(2,jn) - ptin(1,jn))
+               ptout(jkout,jn) = ptin(1,jn)
+            END DO
+         ELSEIF ( pzout(jkout) >= pzin(kjpk_in) ) THEN ! Bottom extrapolation 
+            DO jn = 1, kn_var 
+! linear
+!               ptout(jkout,jn) = ptin(kjpk_in ,jn) + &
+!                               & (pzout(jkout) - pzin(kjpk_in)) / (pzin(kjpk_in)    - pzin(kjpk_in-1)) &
+!                               &                                * (ptin(kjpk_in,jn) - ptin(kjpk_in-1,jn))
+               ptout(jkout,jn) = ptin(kjpk_in ,jn)
+            END DO
          ELSEIF ( ( pzout(jkout) > pzin(1) ).AND.( pzout(jkout) < pzin(kjpk_in) )) THEN
             DO jkin = 1, kjpk_in - 1 !  Loop over source grid

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
+^/vendors/AGRIF/dev@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/vendors/PPR@HEAD            ext/PPR
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@14244        sette