--- MITgcm_contrib/jscott/igsm/src/sur4clm.F	2006/08/11 19:35:32	1.1
+++ MITgcm_contrib/jscott/igsm/src/sur4clm.F	2007/04/23 21:20:18	1.2
@@ -44,7 +44,7 @@
 
 #include "BD2G04.COM"
 
-#include "CLM.COM"
+#include "CLM.h"
 
       COMMON/SPEC2/KM,KINC,COEK,C3LAND(IO0,JM0),C3OICE(IO0,JM0)         5808.1  
      *  ,C3LICE(IO0,JM0),WMGE(IO0,JM0),TSSFC(1,JM0,4)                   5808.2  
@@ -60,7 +60,8 @@
       COMMON/RDATA/ROUGHL(IO0,JM0)                                      5815.   
       LOGICAL POLE,PRNT,HPRNT
       common/conprn/HPRNT          
-      common/TSUR/TSURFC(JM0,0:13),TSURFT(JM0),TSURFD(JM0),DTEMSR(JM0)
+!     common/TSUR/TSURFC(JM0,0:13),TSURFT(JM0),TSURFD(JM0),DTEMSR(JM0)
+#include "TSRF.COM"
       common/SURRAD/TRSURF(JM0,4),SRSURF(JM0,4)
 c     REAL*8 B,TGV,TKV,TSV0,TSV1,TSV                                    5818.   
       integer IQ1,IQ2,IQ3
@@ -136,9 +137,9 @@
       IQ1=IM/4+1                                                        5881.   
       IQ2=IM/2+1                                                        5882.   
       IQ3=3*IM/4+1                                                      5883.   
-      DTSURF=NDYN*DT/NSURF                                              5884.   
-      print *,' DTSURF=',DTSURF
-         DTSRCE=DT*NDYN                                                 5885.   
+!     DTSURF=NDYN*DT/NSURF                                              5884.   
+!     print *,' From SRF4CLM DTSURF=',DTSURF
+!        DTSRCE=DT*NDYN                                                 5885.   
       SHA=RGAS/KAPA                                                     5886.   
       RVX=0.                                                            5887.   
    50 CONTINUE
@@ -202,12 +203,13 @@
       BWS=0.
       BWMG=0.
       IM1=IM                                                            5969.   
-       tsl4clm(j)=0.0
-       qs4clm(j)=0.0
-       ps4clm(j)=0.0
-       ws4clm(j)=0.0
-       us4clm(j)=0.0
-       vs4clm(j)=0.0
+       i=1
+       tsl4clm(i,j)=0.0
+       qs4clm(i,j)=0.0
+       ps4clm(i,j)=0.0
+       ws4clm(i,j)=0.0
+       us4clm(i,j)=0.0
+       vs4clm(i,j)=0.0
       DO 6000 I=1,IMAX                                                  5970.   
 C****                                                                   5971.   
 C**** DETERMINE SURFACE CONDITIONS                                      5972.   
@@ -330,14 +332,14 @@
 c3500 CONTINUE
 
           if(ITYPE.EQ.4.or.ITYPE.EQ.3)then
-           tsl4clm(j)=tsl4clm(j)+TS*PTYPE/PLAND
-           qs4clm(j)=qs4clm(j)+QS*PTYPE/PLAND
-           ps4clm(j)=ps4clm(j)+PS*PTYPE/PLAND
-           ws4clm(j)=ws4clm(j)+WS*PTYPE/PLAND
-!          us4clm(j)=us4clm(j)+US*PTYPE/PLAND
-!          vs4clm(j)=vs4clm(j)+VS*PTYPE/PLAND
-           us4clm(j)=us4clm(j)+RW*US*PTYPE/PLAND
-           vs4clm(j)=vs4clm(j)+RW*VS*PTYPE/PLAND
+           tsl4clm(i,j)=tsl4clm(i,j)+TS*PTYPE/PLAND
+           qs4clm(i,j)=qs4clm(i,j)+QS*PTYPE/PLAND
+           ps4clm(i,j)=ps4clm(i,j)+PS*PTYPE/PLAND
+           ws4clm(i,j)=ws4clm(i,j)+WS*PTYPE/PLAND
+!          us4clm(i,j)=us4clm(i,j)+US*PTYPE/PLAND
+!          vs4clm(i,j)=vs4clm(i,j)+VS*PTYPE/PLAND
+           us4clm(i,j)=us4clm(i,j)+RW*US*PTYPE/PLAND
+           vs4clm(i,j)=vs4clm(i,j)+RW*VS*PTYPE/PLAND
          endif
 
       TSSFC(I,J,ITYPE)=TS                                               6521.5  
@@ -383,6 +385,13 @@
          BLJ(J,28)=BWMG
          BLJ(J,23)=BTS  
  7000 CONTINUE                                                          6677.   
+!     print *,' From SRF4CLM TAU=',TAU
+!          i=1
+!          j=1
+!          print *,'TS(1),TS(2)'
+!          print *,tsl4clm(1,1),tsl4clm(1,2)
+!          print *,dsw4clm(i,j),dlw4clm(i,j)
+!          print *,swinr4clm(i,j), swvis4clm(i,j)
 C****                                                                   6678.   
 #endif
       RETURN                                                            6795.