ecmwf-ifs · reuterbal · Oct 28, 2025 · Oct 21, 2025 · Oct 21, 2025
diff --git a/ifsrrtm/CMakeLists.txt b/ifsrrtm/CMakeLists.txt
@@ -236,6 +236,16 @@ ecbuild_add_library(
     PRIVATE_DEFINITIONS ${GPU_OFFLOAD}GPU
 )
 
+# To ensure device code is generated and all link time dependencies are
+# available with OpenMP target offloading, force the `-mp=gpu` flag for NVHPC
+if( HAVE_GPU AND HAVE_OMP AND GPU_OFFLOAD STREQUAL "OMP" )
+    target_link_libraries( ifsrrtm.${PREC} PUBLIC OpenMP::OpenMP_Fortran )
+    if( CMAKE_Fortran_COMPILER_ID MATCHES "NVHPC" )
+        target_compile_options( ifsrrtm.${PREC} PRIVATE "-mp=gpu" )
+        target_link_options( ifsrrtm.${PREC} PRIVATE "-mp=gpu" )
+    endif()
+endif()
+
 install(
     FILES
         ${ifsrrtm_HEADERS}

diff --git a/ifsrrtm/rrtm_gas_optical_depth.F90 b/ifsrrtm/rrtm_gas_optical_depth.F90
@@ -118,7 +118,9 @@ SUBROUTINE RRTM_GAS_OPTICAL_DEPTH(KIDIA,KFDIA,KLEV,POD,PAVEL, PCOLDRY,PCOLBRD,PW
 
 ASSOCIATE(NFLEVG=>KLEV)
 !$OMP TARGET ENTER DATA MAP(ALLOC: ZTAU)
+#ifndef __NVCOMPILER
 !$OMP TARGET DATA MAP(PRESENT, ALLOC: POD)
+#endif
 !$ACC DATA CREATE(ZTAU) PRESENT(POD)
 
 CALL COMPUTE_LAYTROP_MIN_MAX(KIDIA, KFDIA, KLAYTROP, laytrop_min, laytrop_max)
@@ -250,7 +252,9 @@ SUBROUTINE RRTM_GAS_OPTICAL_DEPTH(KIDIA,KFDIA,KLEV,POD,PAVEL, PCOLDRY,PCOLBRD,PW
 !$ACC WAIT
 !$ACC END DATA
 !$OMP TARGET EXIT DATA MAP(DELETE: ZTAU)
+#ifndef __NVCOMPILER
 !$OMP END TARGET DATA
+#endif
 
 END ASSOCIATE
 

diff --git a/ifsrrtm/rrtm_prepare_gases.F90 b/ifsrrtm/rrtm_prepare_gases.F90
@@ -133,11 +133,13 @@ SUBROUTINE RRTM_PREPARE_GASES &
 !$ACC              PQ, PCO2, PCH4, PN2O, PNO2, PC11, PC12, PC22, PCL4, POZN, &
 !$ACC              PCOLDRY, PWBRODL, PWKL, PWX , &
 !$ACC              PAVEL, PTAVEL, PZ, PTZ , KREFLECT)
+#ifndef __NVCOMPILER
 !$OMP TARGET DATA MAP(PRESENT, ALLOC: PAPH, PAP, &
 !$OMP              PTH, PT, &
 !$OMP              PQ, PCO2, PCH4, PN2O, PNO2, PC11, PC12, PC22, PCL4, POZN, &
 !$OMP              PCOLDRY, PWBRODL, PWKL, PWX , &
 !$OMP              PAVEL, PTAVEL, PZ, PTZ , KREFLECT)
+#endif
 
 ZGRAVIT=(RG/RPLRG)*1.E2_JPRB
 
@@ -306,7 +308,9 @@ SUBROUTINE RRTM_PREPARE_GASES &
   ENDDO
 ENDDO
 !$OMP END TARGET TEAMS DISTRIBUTE PARALLEL DO
+#ifndef __NVCOMPILER
 !$OMP END TARGET DATA
+#endif
 
 #else
 

diff --git a/ifsrrtm/rrtm_taumol1.F90 b/ifsrrtm/rrtm_taumol1.F90
@@ -201,10 +201,12 @@ SUBROUTINE RRTM_TAUMOL1 (KIDIA,KFDIA,KLEV,taug,PAVEL,&
     !$ACC             FORFAC, FORFRAC, JP, JT, jt1, COLH2O, LAYTROP, SELFFAC, &
     !$ACC             SELFFRAC, MINORFRAC, INDSELF, fracs, &
     !$ACC             INDFOR, INDMINOR, SCALEMINORN2, COLBRD)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: PAVEL, taug, P_TAUAERL, FAC00, FAC01, FAC10, FAC11, &
     !$OMP             FORFAC, FORFRAC, JP, JT, jt1, COLH2O, LAYTROP, SELFFAC, &
     !$OMP             SELFFRAC, MINORFRAC, INDSELF, fracs, &
     !$OMP             INDFOR, INDMINOR, SCALEMINORN2, COLBRD)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -409,6 +411,8 @@ SUBROUTINE RRTM_TAUMOL1 (KIDIA,KFDIA,KLEV,taug,PAVEL,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL1
diff --git a/ifsrrtm/rrtm_taumol10.F90 b/ifsrrtm/rrtm_taumol10.F90
@@ -73,9 +73,11 @@ SUBROUTINE RRTM_TAUMOL10 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC DATA PRESENT(taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$ACC             colh2o, laytrop, fracs, selffac, selffrac, indself, &
     !$ACC             indfor, forfrac, forfac)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o, laytrop, fracs, selffac, selffrac, indself, &
     !$OMP             indfor, forfrac, forfac)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -240,6 +242,8 @@ SUBROUTINE RRTM_TAUMOL10 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL10
diff --git a/ifsrrtm/rrtm_taumol11.F90 b/ifsrrtm/rrtm_taumol11.F90
@@ -81,9 +81,11 @@ SUBROUTINE RRTM_TAUMOL11 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC DATA PRESENT(taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$ACC             colh2o, colo2, laytrop, selffac, selffrac, indself, fracs, &
     !$ACC             indfor, forfac, forfrac, minorfrac, indminor, scaleminor)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o, colo2, laytrop, selffac, selffrac, indself, fracs, &
     !$OMP             indfor, forfac, forfrac, minorfrac, indminor, scaleminor)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -273,6 +275,8 @@ SUBROUTINE RRTM_TAUMOL11 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL11
diff --git a/ifsrrtm/rrtm_taumol12.F90 b/ifsrrtm/rrtm_taumol12.F90
@@ -1,7 +1,7 @@
 !----------------------------------------------------------------------------
 SUBROUTINE RRTM_TAUMOL12 (KIDIA,KFDIA,KLEV,taug,&
  & P_TAUAERL,fac00,fac01,fac10,fac11,forfac,forfrac,indfor,jp,jt,jt1,oneminus,&
- & colh2o,colco2,laytrop,selffac,selffrac,indself,fracs, &  
+ & colh2o,colco2,laytrop,selffac,selffrac,indself,fracs, &
  & rat_h2oco2, rat_h2oco2_1,laytrop_min,laytrop_max)
 
 !     BAND 12:  1800-2080 cm-1 (low - H2O,CO2; high - nothing)
@@ -97,9 +97,11 @@ SUBROUTINE RRTM_TAUMOL12 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC DATA PRESENT(taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$ACC             colh2o, colco2, laytrop, selffac, selffrac, indself, fracs, &
     !$ACC             rat_h2oco2, rat_h2oco2_1, indfor, forfrac, forfac)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o, colco2, laytrop, selffac, selffrac, indself, fracs, &
     !$OMP             rat_h2oco2, rat_h2oco2_1, indfor, forfrac, forfac)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -673,6 +675,8 @@ SUBROUTINE RRTM_TAUMOL12 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL12
diff --git a/ifsrrtm/rrtm_taumol13.F90 b/ifsrrtm/rrtm_taumol13.F90
@@ -110,10 +110,12 @@ SUBROUTINE RRTM_TAUMOL13 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC             selffrac, indself, fracs, rat_h2on2o, rat_h2on2o_1, &
     !$ACC             indfor, forfac, forfrac, minorfrac, indminor) &
     !$ACC       CREATE(colco)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o, coln2o, colco2, colo3, coldry, laytrop, selffac, &
     !$OMP             selffrac, indself, fracs, rat_h2on2o, rat_h2on2o_1, &
     !$OMP             indfor, forfac, forfrac, minorfrac, indminor)
+#endif
     !$OMP TARGET ENTER DATA MAP(ALLOC: colco)
 
     !$OMP TARGET TEAMS DISTRIBUTE PARALLEL DO COLLAPSE(2)
@@ -797,6 +799,8 @@ SUBROUTINE RRTM_TAUMOL13 (KIDIA,KFDIA,KLEV,taug,&
       !$ACC WAIT
       !$ACC END DATA
       !$OMP TARGET EXIT DATA MAP(DELETE:colco)
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL13
diff --git a/ifsrrtm/rrtm_taumol14.F90 b/ifsrrtm/rrtm_taumol14.F90
@@ -70,9 +70,11 @@ SUBROUTINE RRTM_TAUMOL14 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC DATA PRESENT(taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$ACC             colco2, laytrop, selffac, selffrac, indself, fracs, &
     !$ACC             indfor, forfac, forfrac)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC:taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colco2, laytrop, selffac, selffrac, indself, fracs, &
     !$OMP             indfor, forfac, forfrac)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -231,6 +233,8 @@ SUBROUTINE RRTM_TAUMOL14 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL14
diff --git a/ifsrrtm/rrtm_taumol15.F90 b/ifsrrtm/rrtm_taumol15.F90
@@ -97,10 +97,12 @@ SUBROUTINE RRTM_TAUMOL15 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC             colh2o,  colco2,  coln2o,  laytrop, selffac, selffrac, &
     !$ACC             indself, fracs, rat_n2oco2, rat_n2oco2_1, indfor, forfac, &
     !$ACC             forfrac, minorfrac, indminor, scaleminor, colbrd)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o,  colco2,  coln2o,  laytrop, selffac, selffrac, &
     !$OMP             indself, fracs, rat_n2oco2, rat_n2oco2_1, indfor, forfac, &
     !$OMP             forfrac, minorfrac, indminor, scaleminor, colbrd)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -730,6 +732,8 @@ SUBROUTINE RRTM_TAUMOL15 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL15
diff --git a/ifsrrtm/rrtm_taumol16.F90 b/ifsrrtm/rrtm_taumol16.F90
@@ -91,9 +91,11 @@ SUBROUTINE RRTM_TAUMOL16 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC DATA PRESENT(taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$ACC             colh2o, colch4, laytrop, selffac, selffrac, indself, &
     !$ACC             fracs, rat_h2och4, rat_h2och4_1, indfor, forfac, forfrac)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o, colch4, laytrop, selffac, selffrac, indself, &
     !$OMP             fracs, rat_h2och4, rat_h2och4_1, indfor, forfac, forfrac)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -679,6 +681,8 @@ SUBROUTINE RRTM_TAUMOL16 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL16
diff --git a/ifsrrtm/rrtm_taumol2.F90 b/ifsrrtm/rrtm_taumol2.F90
@@ -82,9 +82,11 @@ SUBROUTINE RRTM_TAUMOL2 (KIDIA,KFDIA,KLEV,taug,PAVEL,coldry,&
     !$ACC DATA PRESENT(taug, PAVEL, coldry, P_TAUAERL, fac00, fac01, fac10, &
     !$ACC             fac11, forfrac, forfac, jp, jt, jt1, colh2o, laytrop, &
     !$ACC             selffac, selffrac, indself, indfor, fracs)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, PAVEL, coldry, P_TAUAERL, fac00, fac01, fac10, &
     !$OMP             fac11, forfrac, forfac, jp, jt, jt1, colh2o, laytrop, &
     !$OMP             selffac, selffrac, indself, indfor, fracs)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -254,6 +256,8 @@ SUBROUTINE RRTM_TAUMOL2 (KIDIA,KFDIA,KLEV,taug,PAVEL,coldry,&
     ENDIF
 
     !$ACC END DATA
+#ifndef __NVCOMPILER
     !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL2
diff --git a/ifsrrtm/rrtm_taumol3.F90 b/ifsrrtm/rrtm_taumol3.F90
@@ -105,10 +105,12 @@ SUBROUTINE RRTM_TAUMOL3 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC             JT, jt1, COLH2O, COLCO2, COLN2O, COLDRY, LAYTROP, &
     !$ACC             SELFFAC, SELFFRAC, INDSELF, FRACS, RAT_H2OCO2, &
     !$ACC             RAT_H2OCO2_1, INDFOR, FORFRAC, MINORFRAC, INDMINOR)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC:taug, P_TAUAERL, FAC00, FAC01, FAC10, FAC11, FORFAC, JP, &
     !$OMP             JT, jt1, COLH2O, COLCO2, COLN2O, COLDRY, LAYTROP, &
     !$OMP             SELFFAC, SELFFRAC, INDSELF, FRACS, RAT_H2OCO2, &
     !$OMP             RAT_H2OCO2_1, INDFOR, FORFRAC, MINORFRAC, INDMINOR)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -889,6 +891,8 @@ SUBROUTINE RRTM_TAUMOL3 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL3
diff --git a/ifsrrtm/rrtm_taumol4.F90 b/ifsrrtm/rrtm_taumol4.F90
@@ -97,10 +97,12 @@ SUBROUTINE RRTM_TAUMOL4 (KIDIA,KFDIA,KLEV,taug,&
 !$ACC             colh2o, colco2, colo3, laytrop, selffac, selffrac, indself, &
 !$ACC             fracs, rat_h2oco2, rat_h2oco2_1, rat_o3co2, rat_o3co2_1, &
 !$ACC             indfor, forfac, forfrac)
+#ifndef __NVCOMPILER
 !$OMP TARGET DATA MAP(PRESENT, ALLOC: taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
 !$OMP             colh2o, colco2, colo3, laytrop, selffac, selffrac, indself, &
 !$OMP             fracs, rat_h2oco2, rat_h2oco2_1, rat_o3co2, rat_o3co2_1, &
 !$OMP             indfor, forfac, forfrac)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -800,6 +802,8 @@ SUBROUTINE RRTM_TAUMOL4 (KIDIA,KFDIA,KLEV,taug,&
       END IF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL4
diff --git a/ifsrrtm/rrtm_taumol5.F90 b/ifsrrtm/rrtm_taumol5.F90
@@ -105,10 +105,12 @@ SUBROUTINE RRTM_TAUMOL5 (KIDIA,KFDIA,KLEV,taug,wx,&
     !$ACC             jt1, colh2o, colco2, colo3, laytrop, selffac, selffrac, &
     !$ACC             indself, fracs, rat_h2oco2, rat_h2oco2_1, rat_o3co2, &
     !$ACC             rat_o3co2_1, indfor, forfrac, forfac, minorfrac, indminor)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC:taug, wx, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, &
     !$OMP             jt1, colh2o, colco2, colo3, laytrop, selffac, selffrac, &
     !$OMP             indself, fracs, rat_h2oco2, rat_h2oco2_1, rat_o3co2, &
     !$OMP             rat_o3co2_1, indfor, forfrac, forfac, minorfrac, indminor)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -809,6 +811,8 @@ SUBROUTINE RRTM_TAUMOL5 (KIDIA,KFDIA,KLEV,taug,wx,&
     END IF
 
     !$ACC END DATA
+#ifndef __NVCOMPILER
     !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL5
diff --git a/ifsrrtm/rrtm_taumol6.F90 b/ifsrrtm/rrtm_taumol6.F90
@@ -84,10 +84,12 @@ SUBROUTINE RRTM_TAUMOL6 (KIDIA,KFDIA,KLEV,taug,wx,&
     !$ACC             jt1, colh2o, colco2, coldry, laytrop, selffac, selffrac , &
     !$ACC             indself, fracs, indfor, forfac, forfrac, minorfrac, &
     !$ACC             indminor)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC:taug, wx, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt,  &
     !$OMP             jt1, colh2o, colco2, coldry, laytrop, selffac, selffrac , &
     !$OMP             indself, fracs, indfor, forfac, forfrac, minorfrac, &
     !$OMP             indminor)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -279,6 +281,8 @@ SUBROUTINE RRTM_TAUMOL6 (KIDIA,KFDIA,KLEV,taug,wx,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL6
diff --git a/ifsrrtm/rrtm_taumol7.F90 b/ifsrrtm/rrtm_taumol7.F90
@@ -104,10 +104,12 @@ SUBROUTINE RRTM_TAUMOL7 (KIDIA,KFDIA,KLEV,taug,&
     !$ACC             colh2o, colo3, colco2, coldry, laytrop, selffac, selffrac, indself, fracs, &
     !$ACC             rat_h2oo3, rat_h2oo3_1, indfor, forfrac, forfac, &
     !$ACC             minorfrac, indminor)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC:taug, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, jt1, &
     !$OMP             colh2o, colo3, colco2, coldry, laytrop, selffac, selffrac, indself, fracs, &
     !$OMP             rat_h2oo3, rat_h2oo3_1, indfor, forfrac, forfac, &
     !$OMP             minorfrac, indminor)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -819,6 +821,8 @@ SUBROUTINE RRTM_TAUMOL7 (KIDIA,KFDIA,KLEV,taug,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL7
diff --git a/ifsrrtm/rrtm_taumol8.F90 b/ifsrrtm/rrtm_taumol8.F90
@@ -88,10 +88,12 @@ SUBROUTINE RRTM_TAUMOL8 (KIDIA,KFDIA,KLEV,taug,wx,&
     !$ACC             jt1, colh2o, colo3, coln2o, colco2, coldry, laytrop, &
     !$ACC             selffac, selffrac, indself, fracs, indfor, forfrac, forfac, &
     !$ACC             minorfrac, indminor)
+#ifndef __NVCOMPILER
     !$OMP TARGET DATA MAP(PRESENT, ALLOC:taug, wx, P_TAUAERL, fac00, fac01, fac10, fac11, jp, jt, &
     !$OMP             jt1, colh2o, colo3, coln2o, colco2, coldry, laytrop, &
     !$OMP             selffac, selffrac, indself, fracs, indfor, forfrac, forfac, &
     !$OMP             minorfrac, indminor)
+#endif
 
 #if !defined(_OPENACC) && !defined(OMPGPU)
     ixlow  = 0
@@ -350,6 +352,8 @@ SUBROUTINE RRTM_TAUMOL8 (KIDIA,KFDIA,KLEV,taug,wx,&
       ENDIF
 
       !$ACC END DATA
+#ifndef __NVCOMPILER
       !$OMP END TARGET DATA
+#endif
 
 END SUBROUTINE RRTM_TAUMOL8