--- MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h	2012/08/09 21:18:53	1.3
+++ MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h	2012/10/23 17:55:30	1.5
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h,v 1.3 2012/08/09 21:18:53 jahn Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/darwin2/pkg/darwin/SPECTRAL.h,v 1.5 2012/10/23 17:55:30 stephd Exp $
 C $Name:  $
 
 C SPECTRAL.h 
@@ -23,11 +23,14 @@
 #endif
 
       COMMON /SPECTRAL_OUPUT/
+#ifdef DAR_DIAG_PARW
+     &      PARwave,
+#endif
 #ifdef DAR_DIAG_IRR
-     &      Edave,Esave,Euave,Eutave,
+     &      Edave,Esave,Euave,Estave,Eutave,
 #endif
 #ifdef DAR_DIAG_IRR_AMPS
-     &      c1ave,c2ave,
+     &      amp1ave,amp2ave,
 #endif
 #ifdef DAR_DIAG_ABSORP
      &      aave,
@@ -41,17 +44,26 @@
      &      btpartave,
      &      bbpartave,
 #endif
+#ifdef DAR_DIAG_EK
+     &      Ek_nlave,
+     &      EkoverE_nlave,
+#endif
      &      rmudave
 
+#ifdef DAR_DIAG_PARW
+       _RL  PARwave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx, nSy,tlam)
+#endif
+
 #ifdef DAR_DIAG_IRR
        _RL  Edave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
        _RL  Esave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
        _RL  Euave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
+       _RL  Estave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
        _RL  Eutave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
 #endif
 #ifdef DAR_DIAG_IRR_AMPS
-       _RL  c1ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
-       _RL  c2ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
+       _RL  amp1ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
+       _RL  amp2ave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
 #endif
 #ifdef DAR_DIAG_ABSORP
        _RL  aave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
@@ -65,5 +77,11 @@
        _RL  bbpartave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
        _RL  btpartave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx,nSy,tlam)
 #endif
+#ifdef DAR_DIAG_EK
+       _RL  Ek_nlave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx, nSy,npmax,
+     &              tlam)
+       _RL  EkoverE_nlave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nR,nSx, nSy,
+     &                   npmax,tlam)
+#endif
        _RL  rmudave(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy)