/[MITgcm]/MITgcm_contrib/dgoldberg/streamice/streamice_cg_solve.F
ViewVC logotype

Diff of /MITgcm_contrib/dgoldberg/streamice/streamice_cg_solve.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.2 by heimbach, Wed May 2 02:36:01 2012 UTC revision 1.3 by dgoldberg, Mon May 14 16:52:29 2012 UTC
# Line 200  c  ! initially, b-grid data is valid up Line 200  c  ! initially, b-grid data is valid up
200    
201        print *, "BEGINNING MAIN CG LOOP"        print *, "BEGINNING MAIN CG LOOP"
202    
203        IF(STREAMICE_construct_matrix) CALL STREAMICE_CG_MAKE_A(myThid)  !       IF(STREAMICE_construct_matrix) CALL STREAMICE_CG_MAKE_A(myThid)
204    #ifdef STREAMICE_CONSTRUCT_MATRIX
205    
206          CALL STREAMICE_CG_MAKE_A(myThid)
207    
208    #endif
209    
210        do iter = 1, streamice_max_cg_iter        do iter = 1, streamice_max_cg_iter
211         if (resid .gt. tolerance*resid_0) then         if (resid .gt. tolerance*resid_0) then
# Line 226  c      to avoid using "exit" Line 231  c      to avoid using "exit"
231          ENDDO          ENDDO
232         ENDDO         ENDDO
233    
234         IF (STREAMICE_construct_matrix) THEN  !        IF (STREAMICE_construct_matrix) THEN
235    
236    #ifdef STREAMICE_CONSTRUCT_MATRIX
237    
238          DO bj = myByLo(myThid), myByHi(myThid)          DO bj = myByLo(myThid), myByHi(myThid)
239           DO bi = myBxLo(myThid), myBxHi(myThid)           DO bi = myBxLo(myThid), myBxHi(myThid)
240            DO j=js,je            DO j=js,je
# Line 250  c      to avoid using "exit" Line 258  c      to avoid using "exit"
258           ENDDO           ENDDO
259          ENDDO          ENDDO
260    
261         else  !        else
262    #else
263    
264          CALL STREAMICE_CG_ACTION( myThid,          CALL STREAMICE_CG_ACTION( myThid,
265       O     Au_SI,       O     Au_SI,
# Line 259  c      to avoid using "exit" Line 268  c      to avoid using "exit"
268       I     Dv_SI,       I     Dv_SI,
269       I     is,ie,js,je)       I     is,ie,js,je)
270    
271         ENDIF  !        ENDIF
272    
273    #endif
274                
275  ! !        if (iter.eq.1) then  ! !        if (iter.eq.1) then
276  ! !         CALL WRITE_FLD_XY_RL ("Au2","",Au_SI,0,myThid)  ! !         CALL WRITE_FLD_XY_RL ("Au2","",Au_SI,0,myThid)

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3

  ViewVC Help
Powered by ViewVC 1.1.22