/[MITgcm]/MITgcm/pkg/ptracers/ptracers_read_pickup.F
ViewVC logotype

Diff of /MITgcm/pkg/ptracers/ptracers_read_pickup.F

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

revision 1.11 by jahn, Thu May 8 19:50:09 2008 UTC revision 1.12 by jmc, Fri May 9 21:44:31 2008 UTC
# Line 82  C       Read variables from the pickup f Line 82  C       Read variables from the pickup f
82       &                     Nr, myThid )       &                     Nr, myThid )
83          ENDDO          ENDDO
84        ENDIF        ENDIF
 #ifdef GAD_ALLOW_SOM_ADVECT  
85        IF ( useMNC .AND. PTRACERS_pickup_read_mnc ) THEN        IF ( useMNC .AND. PTRACERS_pickup_read_mnc ) THEN
86         DO iTracer = 1, PTRACERS_numInUse         DO iTracer = 1, PTRACERS_numInUse
87          IF ( PTRACERS_SOM_Advection(iTracer) ) THEN          IF ( PTRACERS_SOM_Advection(iTracer) ) THEN
# Line 94  C       Read variables from the pickup f Line 93  C       Read variables from the pickup f
93          ENDIF          ENDIF
94         ENDDO         ENDDO
95        ENDIF        ENDIF
 #endif /*  GAD_ALLOW_SOM_ADVECT  */  
96  #endif /*  ALLOW_MNC  */  #endif /*  ALLOW_MNC  */
97    
98        IF ( PTRACERS_pickup_read_mdsio ) THEN        IF ( PTRACERS_pickup_read_mdsio ) THEN
# Line 256  C--    Check for missing fields: Line 254  C--    Check for missing fields:
254       I                     nMissing, nbFields,       I                     nMissing, nbFields,
255       I                     myIter, myThid )       I                     myIter, myThid )
256    
257  #if defined(GAD_ALLOW_SOM_ADVECT) && defined(PTRACERS_ALLOW_DYN_STATE)  #ifdef PTRACERS_ALLOW_DYN_STATE
258  C--   Read pickup file with 2nd.Order moment fields  C--   Read pickup file with 2nd.Order moment fields
259         DO iTracer = 1, PTRACERS_numInUse         DO iTracer = 1, PTRACERS_numInUse
260          IF ( PTRACERS_SOM_Advection(iTracer) ) THEN          IF ( PTRACERS_SOM_Advection(iTracer) ) THEN
# Line 268  C--   Read pickup file with 2nd.Order mo Line 266  C--   Read pickup file with 2nd.Order mo
266             WRITE(fn,'(3A,A10)') 'pickup_somTRAC',             WRITE(fn,'(3A,A10)') 'pickup_somTRAC',
267       &                     PTRACERS_ioLabel(iTracer),'.', pickupSuff       &                     PTRACERS_ioLabel(iTracer),'.', pickupSuff
268           ENDIF           ENDIF
269           WRITE(msgBuf,'(A,I3,A)')'PTRACERS_READ_PICKUP: iTracer = ',           WRITE(msgBuf,'(A,I3,A)')'PTRACERS_READ_PICKUP: iTracer = ',
270       &                      iTracer,       &                      iTracer,
271       &                      ' : reading 2nd-order moments from file '       &                      ' : reading 2nd-order moments from file '
272           CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,           CALL PRINT_MESSAGE( msgBuf, standardMessageUnit,
# Line 283  C        Read 2nd Order moments as conse Line 281  C        Read 2nd Order moments as conse
281       O               _Ptracers_som(1-Olx,1-Oly,1,1,1,n,iTracer),       O               _Ptracers_som(1-Olx,1-Oly,1,1,1,n,iTracer),
282       I               iRec, myIter, myThid )       I               iRec, myIter, myThid )
283           ENDDO           ENDDO
284           CALL GAD_EXCH_SOM( _Ptracers_som(1-Olx,1-Oly,1,1,1,1,iTracer),           CALL GAD_EXCH_SOM( _Ptracers_som(1-Olx,1-Oly,1,1,1,1,iTracer),
285       &                      Nr, myThid )       &                      Nr, myThid )
286          ENDIF          ENDIF
287         ENDDO         ENDDO
288  #endif /* GAD_ALLOW_SOM_ADVECT && PTRACERS_ALLOW_DYN_STATE */  #endif /* PTRACERS_ALLOW_DYN_STATE */
289         _BARRIER         _BARRIER
290    
291  C--   end: pickup_read_mdsio  C--   end: pickup_read_mdsio
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12
  ViewVC Help
Powered by ViewVC 1.1.22