--- MITgcm/pkg/atm_compon_interf/atm_store_qshortwave.F	2004/04/18 15:38:45	1.2
+++ MITgcm/pkg/atm_compon_interf/atm_store_qshortwave.F	2004/05/21 20:00:48	1.3
@@ -1,12 +1,12 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/atm_compon_interf/Attic/atm_store_qshortwave.F,v 1.2 2004/04/18 15:38:45 jmc Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/pkg/atm_compon_interf/Attic/atm_store_qshortwave.F,v 1.3 2004/05/21 20:00:48 jmc Exp $
 C $Name:  $  
 
-#include "AIM_OPTIONS.h"
+#include "CPP_OPTIONS.h"
 
 CStartOfInterface
       SUBROUTINE ATM_STORE_QSHORTWAVE(bi,bj,
-     I                                myCurrentTime, 
-     I                                myCurrentIter, 
+     I                                myTime, 
+     I                                myIter, 
      I                                myThid )
 C     /==========================================================\
 C     | SUBROUTINE ATM_STORE_QSHORTWAVE                          |
@@ -18,47 +18,46 @@
       IMPLICIT NONE
 
 C     == Global variables ==
-#include "AIM_SIZE.h"
+#include "SIZE.h"
 #include "EEPARAMS.h"
 #include "PARAMS.h"
 #include "CPL_PARAMS.h"
+C     == Global variables (main model)
+#include "FFIELDS.h"
 C     == Global variables for coupling interface ==
 #include "ATMCPL.h"
-C     == AIMPHYS specific global data ==
-#include "com_physvar.h"
 
 
 C     == Routine arguments ==
-C     bi,bj         - Tile index
-C     myThid        - Thread number for this instance of the routine
-C     myCurrentIter - Current timestep number
-C     myCurrentTime - Current model time
+C     bi,bj  - Tile index
+C     myThid - Thread number for this instance of the routine
+C     myIter - Current timestep number
+C     myTime - Current model time
       INTEGER bi, bj
-      _RL     myCurrentTime
-      INTEGER myCurrentIter
+      _RL     myTime
+      INTEGER myIter
       INTEGER myThid
 CEndOfInterface
 
+#ifdef COMPONENT_MODULE
 C     == Local variables ==
-C     I,J,K,II - Loop counters
-      INTEGER I,J,K,II
+C     i,j - Loop counters
+      INTEGER i,j
       _RL cplTimeFraction
 
 C     o Accumulate heat flux that will be exported to the coupling layer.
-C     +ve into atmos., W/m^2.
-      cplTimeFraction = 1. _d 0 / DFLOAT(cplSendFrq_iter)
-c     DO bj=myByLo(myThid),myByHi(myThid)
-c      DO bi=myBxLo(myThid),myBxHi(myThid)
-        QshortwaveTime(bi,bj) = QshortwaveTime(bi,bj) + cplTimeFraction
-        DO J=1,sNy
-         DO I=1,sNx
-          II = (sNx)*(J-1)+I
-          Qshortwave(I,J,bi,bj) = 
-     &    Qshortwave(I,J,bi,bj) - SSR(II,2,myThid)*cplTimeFraction
+C     +ve into atmos., W/m2.
+
+       cplTimeFraction = 1. _d 0 / DFLOAT(cplSendFrq_iter)
+       qShortWaveTime(bi,bj) = qShortWaveTime(bi,bj) + cplTimeFraction
+       DO j=1,sNy
+         DO i=1,sNx
+          qShortWave(i,j,bi,bj) = qShortWave(i,j,bi,bj)
+     &                          + Qsw(i,j,bi,bj)*cplTimeFraction
          ENDDO
-        ENDDO
-c      ENDDO
-c     ENDDO
+       ENDDO
+
+#endif /* COMPONENT_MODULE */
 
       RETURN
       END