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

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

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

revision 1.6 by jahn, Fri May 9 14:30:17 2008 UTC revision 1.7 by jmc, Fri May 9 21:44:31 2008 UTC
# Line 66  C     Loop over tracers Line 66  C     Loop over tracers
66          PTRACERS_SOM_Advection(iTracer) =          PTRACERS_SOM_Advection(iTracer) =
67       &    PTRACERS_advScheme(iTracer).GE.ENUM_SOM_PRATHER       &    PTRACERS_advScheme(iTracer).GE.ENUM_SOM_PRATHER
68       &    .AND. PTRACERS_advScheme(iTracer).LE.ENUM_SOM_LIMITER       &    .AND. PTRACERS_advScheme(iTracer).LE.ENUM_SOM_LIMITER
 #ifndef GAD_ALLOW_SOM_ADVECT  
         IF ( PTRACERS_SOM_Advection(iTracer) ) THEN  
           WRITE(msgBuf,'(2A)') 'PTRACERS_INIT_FIXED: ',  
      &   'trying to use 2nd.Order-Moment Advection that is not compiled'  
           WRITE(msgBuf,'(2A)') 'PTRACERS_INIT_FIXED: ',  
      &   'Re-compile with:  #define GAD_ALLOW_SOM_ADVECT'  
           CALL PRINT_ERROR( msgBuf , myThid)  
           STOP 'ABNORMAL END: S/R PTRACERS_INIT_FIXED'  
         ENDIF  
 #endif /* ndef GAD_ALLOW_SOM_ADVECT */  
69  #ifndef PTRACERS_ALLOW_DYN_STATE  #ifndef PTRACERS_ALLOW_DYN_STATE
70          IF ( PTRACERS_SOM_Advection(iTracer) ) THEN          IF ( PTRACERS_SOM_Advection(iTracer) ) THEN
71            WRITE(msgBuf,'(2A)') 'PTRACERS_INIT_FIXED: ',            WRITE(msgBuf,'(2A)') 'PTRACERS_INIT_FIXED: ',
# Line 99  C       end of Tracer loop Line 89  C       end of Tracer loop
89        ENDDO        ENDDO
90    
91  #ifdef PTRACERS_ALLOW_DYN_STATE  #ifdef PTRACERS_ALLOW_DYN_STATE
92        CALL PTRACERS_INIT_FIXED_DYNAMIC( PtrISt,        CALL PTRACERS_INIT_FIXED_DYNAMIC( PtrISt,
93       &                                  PTRACERS_numInUse,       &                                  PTRACERS_numInUse,
94       &                                  PTRACERS_SOM_Advection,       &                                  PTRACERS_SOM_Advection,
95       &                                  sNx, sNy, Nr, OLx, OLy,       &                                  sNx, sNy, Nr, OLx, OLy,

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7

  ViewVC Help
Powered by ViewVC 1.1.22