Adjust interpv templates for vscode compatibility

The mock-template code that uses the C preprocessor to define multiple versions of Interp/Extrap functions is incompatible with Fortran linting, crashing the linter (see fortran-lang/fortls#236) because it tries to process the Fortran syntax without invoking the preprocessor. This code adjusts the templates to hold just the subroutine body, leaving the `end subroutine` statement for the enclosing Fortran file. This change fixes the linter crash, although it still doesn't properly understand the subroutines.
ECCC-ASTD-MRD · Dec 5, 2023 · 71e7810 · 71e7810
1 parent 616633f
commit 71e7810
Show file tree

Hide file tree

Showing 21 changed files with 521 additions and 103 deletions.
diff --git a/src/interpv/Extrap1D_Abort.F90 b/src/interpv/Extrap1D_Abort.F90
@@ -17,31 +17,81 @@
 
 !version that accepts real(single) arguments, with the extended interface
 subroutine Extrap1D_Abort_X  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+    src_ijDim, dst_ijDim, &
+
+    vLevelSource, stateSource, stateDerivSource, &
+
+    posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+    extrapEnableDown, extrapEnableUp, &
+    extrapGuideDown, extrapGuideUp, &
+
+    flux, numExtArraysIn, numExtArraysOut, &
+    ExtArraysIn, ExtArraysOut &
+   )
 #define real48 single
 #include "Extrap1D_Abort_Body.inc"
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments, with the extended interface
 subroutine Extrap1D_Abort_X8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+    src_ijDim, dst_ijDim, &
+
+    vLevelSource, stateSource, stateDerivSource, &
+
+    posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+    extrapEnableDown, extrapEnableUp, &
+    extrapGuideDown, extrapGuideUp, &
+
+    flux, numExtArraysIn, numExtArraysOut, &
+    ExtArraysIn, ExtArraysOut &
+   )
 #define real48 double
 #include "Extrap1D_Abort_Body.inc"
 #undef real48
+end subroutine
 
 
 
 
 !version that accepts real(single) arguments
 subroutine Extrap1D_Abort  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+    src_ijDim, dst_ijDim, &
+
+    vLevelSource, stateSource, stateDerivSource, &
+
+    posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+    extrapEnableDown, extrapEnableUp, &
+    extrapGuideDown, extrapGuideUp &
+   )
 #define real48 single
 #define DestnFunc Extrap1D_Abort_X
 #include "Interp1D_PreX_Shell.inc"
 #undef DestnFunc
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments
 subroutine Extrap1D_Abort8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp &
+    )
 #define real48 double
 #define DestnFunc Extrap1D_Abort_X8
 #include "Interp1D_PreX_Shell.inc"
 #undef DestnFunc
 #undef real48
+end subroutine
diff --git a/src/interpv/Extrap1D_Abort_Body.inc b/src/interpv/Extrap1D_Abort_Body.inc
@@ -1,19 +1,19 @@
 !!!s/r Extrap1D_Abort - Abort if an extrapolation is required
 !subroutine Extrap1D_Abort_X  &
 !subroutine Extrap1D_Abort_X8 &
-                      (numInterpSets, srcNumLevels, destNumLevels, &
-                       src_ijDim, dst_ijDim, &
+                      ! (numInterpSets, srcNumLevels, destNumLevels, &
+                      !  src_ijDim, dst_ijDim, &
 
-                       vLevelSource, stateSource, stateDerivSource, &
+                      !  vLevelSource, stateSource, stateDerivSource, &
 
-                       posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+                      !  posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
 
-                       extrapEnableDown, extrapEnableUp, &
-                       extrapGuideDown, extrapGuideUp, &
+                      !  extrapEnableDown, extrapEnableUp, &
+                      !  extrapGuideDown, extrapGuideUp, &
 
-                       flux, numExtArraysIn, numExtArraysOut, &
-                       ExtArraysIn, ExtArraysOut &
-                      )
+                      !  flux, numExtArraysIn, numExtArraysOut, &
+                      !  ExtArraysIn, ExtArraysOut &
+                      ! )
   ! These are dummy arguments for this function:  stateDerivSource,
   ! stateDerivDestn, flux, numExtArraysIn, numExtArraysOut, ExtArraysIn, 
   ! ExtArraysOut
@@ -93,4 +93,4 @@
 !$OMP END parallel do
 
 
-end subroutine ! Extrap1D_Abort_X
+! end subroutine ! Extrap1D_Abort_X
diff --git a/src/interpv/Extrap1D_Fixed.F90 b/src/interpv/Extrap1D_Fixed.F90
@@ -17,31 +17,81 @@
 
 !version that accepts real(single) arguments, with the extended interface
 subroutine Extrap1D_Fixed_X  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp, &
+
+     flux, numExtArraysIn, numExtArraysOut, &
+     ExtArraysIn, ExtArraysOut &
+    )
 #define real48 single
 #include "Extrap1D_Fixed_Body.inc"
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments, with the extended interface
 subroutine Extrap1D_Fixed_X8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp, &
+
+     flux, numExtArraysIn, numExtArraysOut, &
+     ExtArraysIn, ExtArraysOut &
+    )
 #define real48 double
 #include "Extrap1D_Fixed_Body.inc"
 #undef real48
+end subroutine
 
 
 
 
 !version that accepts real(single) arguments
 subroutine Extrap1D_Fixed  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp &
+    )
 #define real48 single
 #define DestnFunc Extrap1D_Fixed_X
 #include "Interp1D_PreX_Shell.inc"
 #undef DestnFunc
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments
 subroutine Extrap1D_Fixed8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp &
+    )
 #define real48 double
 #define DestnFunc Extrap1D_Fixed_X8
 #include "Interp1D_PreX_Shell.inc"
 #undef DestnFunc
 #undef real48
+end subroutine
diff --git a/src/interpv/Extrap1D_Fixed_Body.inc b/src/interpv/Extrap1D_Fixed_Body.inc
@@ -1,19 +1,19 @@
 !!!s/r Extrap1D_Fixed - Extrapolate, to a fixed (selectable) value
 !subroutine Extrap1D_Fixed_X  &
 !subroutine Extrap1D_Fixed_X8 &
-                      (numInterpSets, srcNumLevels, destNumLevels, &
-                       src_ijDim, dst_ijDim, &
+                      ! (numInterpSets, srcNumLevels, destNumLevels, &
+                      !  src_ijDim, dst_ijDim, &
 
-                       vLevelSource, stateSource, stateDerivSource, &
+                      !  vLevelSource, stateSource, stateDerivSource, &
 
-                       posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+                      !  posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
 
-                       extrapEnableDown, extrapEnableUp, &
-                       extrapGuideDown, extrapGuideUp, &
+                      !  extrapEnableDown, extrapEnableUp, &
+                      !  extrapGuideDown, extrapGuideUp, &
 
-                       flux, numExtArraysIn, numExtArraysOut, &
-                       ExtArraysIn, ExtArraysOut &
-                      )
+                      !  flux, numExtArraysIn, numExtArraysOut, &
+                      !  ExtArraysIn, ExtArraysOut &
+                      ! )
   ! These are dummy arguments for this function:  stateDerivSource,
   ! stateDerivDestn, flux, numExtArraysIn, numExtArraysOut, ExtArraysIn, 
   ! ExtArraysOut
@@ -100,4 +100,4 @@
 !$OMP END parallel do
 
 
-end subroutine ! Extrap1D_Fixed_X
+! end subroutine ! Extrap1D_Fixed_X
diff --git a/src/interpv/Extrap1D_LapseRate.F90 b/src/interpv/Extrap1D_LapseRate.F90
@@ -19,31 +19,81 @@
 
 !version that accepts real(single) arguments, with the extended interface
 subroutine Extrap1D_LapseRate_X  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp, &
+
+     flux, numExtArraysIn, numExtArraysOut, &
+     ExtArraysIn, ExtArraysOut &
+    )
 #define real48 single
 #include "Extrap1D_LapseRate_Body.inc"
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments, with the extended interface
 subroutine Extrap1D_LapseRate_X8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp, &
+
+     flux, numExtArraysIn, numExtArraysOut, &
+     ExtArraysIn, ExtArraysOut &
+    )
 #define real48 double
 #include "Extrap1D_LapseRate_Body.inc"
 #undef real48
+end subroutine
 
 
 
 
 !version that accepts real(single) arguments
 subroutine Extrap1D_LapseRate  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp &
+    )
 #define real48 single
 #define DestnFunc Extrap1D_LapseRate_X
 #include "Interp1D_PreX_Shell.inc"
 #undef DestnFunc
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments
 subroutine Extrap1D_LapseRate8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+     src_ijDim, dst_ijDim, &
+
+     vLevelSource, stateSource, stateDerivSource, &
+
+     posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+     extrapEnableDown, extrapEnableUp, &
+     extrapGuideDown, extrapGuideUp &
+    )
 #define real48 double
 #define DestnFunc Extrap1D_LapseRate_X8
 #include "Interp1D_PreX_Shell.inc"
 #undef DestnFunc
 #undef real48
+end subroutine
diff --git a/src/interpv/Extrap1D_LapseRate_Body.inc b/src/interpv/Extrap1D_LapseRate_Body.inc
@@ -1,19 +1,19 @@
 !!!s/r Extrap1D_LapseRate - Extrapolate, based on lapse rates
 !subroutine Extrap1D_LapseRate_X  &
 !subroutine Extrap1D_LapseRate_X8 &
-                      (numInterpSets, srcNumLevels, destNumLevels, &
-                       src_ijDim, dst_ijDim, &
+!                       (numInterpSets, srcNumLevels, destNumLevels, &
+!                        src_ijDim, dst_ijDim, &
 
-                       vLevelSource, stateSource, stateDerivSource, &
+!                        vLevelSource, stateSource, stateDerivSource, &
 
-                       posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+!                        posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
 
-                       extrapEnableDown, extrapEnableUp, &
-                       extrapGuideDown, extrapGuideUp, &
+!                        extrapEnableDown, extrapEnableUp, &
+!                        extrapGuideDown, extrapGuideUp, &
 
-                       flux, numExtArraysIn, numExtArraysOut, &
-                       ExtArraysIn, ExtArraysOut &
-                      )
+!                        flux, numExtArraysIn, numExtArraysOut, &
+!                        ExtArraysIn, ExtArraysOut &
+!                       )
   ! These are dummy arguments for this function:  stateDerivSource,
   ! stateDerivDestn, flux, numExtArraysIn, numExtArraysOut, ExtArraysIn, 
   ! ExtArraysOut
@@ -118,4 +118,4 @@
 !$OMP END parallel do
 
 
-end subroutine ! Extrap1D_LapseRate_X
+! end subroutine ! Extrap1D_LapseRate_X
diff --git a/src/interpv/Extrap1D_Surface.F90 b/src/interpv/Extrap1D_Surface.F90
@@ -21,12 +21,40 @@
 
 !version that accepts real(single) arguments, with the extended interface
 subroutine Extrap1D_Surface_X  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+    src_ijDim, dst_ijDim, &
+
+    vLevelSource, stateSource, stateDerivSource, &
+
+    posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+    extrapEnableDown, extrapEnableUp, &
+    extrapGuideDown, extrapGuideUp, &
+
+    flux, numExtArraysIn, numExtArraysOut, &
+    ExtArraysIn, ExtArraysOut &
+   )
 #define real48 single
 #include "Extrap1D_Surface_Body.inc"
 #undef real48
+end subroutine
 
 !version that accepts real(double) arguments, with the extended interface
 subroutine Extrap1D_Surface_X8  &
+    (numInterpSets, srcNumLevels, destNumLevels, &
+    src_ijDim, dst_ijDim, &
+
+    vLevelSource, stateSource, stateDerivSource, &
+
+    posnDestInSrc, vLevelDestn, stateDestn, stateDerivDestn, &
+
+    extrapEnableDown, extrapEnableUp, &
+    extrapGuideDown, extrapGuideUp, &
+
+    flux, numExtArraysIn, numExtArraysOut, &
+    ExtArraysIn, ExtArraysOut &
+   )
 #define real48 double
 #include "Extrap1D_Surface_Body.inc"
 #undef real48
+end subroutine