| 1 | diff -b original_code/gad_diagnostics_init.F new_code/gad_diagnostics_init.F | 
| 2 | 209c209,211 | 
| 3 | <         WRITE(GAD_DIAG_SUFX,'(A,I2.2)') 'Tr',tracerId + 1-GAD_TR1 | 
| 4 | --- | 
| 5 | > C       WRITE(GAD_DIAG_SUFX,'(A,I2.2)') 'Tr',tracerId + 1-GAD_TR1 | 
| 6 | >         WRITE(GAD_DIAG_SUFX,'(A,A2)') 'Tr', | 
| 7 | >      &    GAD_iolabel(tracerId + 1-GAD_TR1) | 
| 8 | diff -b original_code/GAD.h new_code/GAD.h | 
| 9 | 97a98,106 | 
| 10 | > C     GAD_iolabel :: Sequence of two character io labels used to identify | 
| 11 | > C                 :: different tracers for GAD io and diagnostics. Size | 
| 12 | > C                 :: limit needs to be consistent with label generation | 
| 13 | > C                 :: algorithm (usually make_default_dlabel_list). | 
| 14 | >       INTEGER     GAD_iolabel_nmax | 
| 15 | >       PARAMETER   ( GAD_iolabel_nmax = 3843 ) | 
| 16 | >       CHARACTER*2 GAD_iolabel(GAD_iolabel_nmax) | 
| 17 | >       COMMON /GAD_PARM_C/ | 
| 18 | >      &      GAD_iolabel | 
| 19 | diff -b original_code/gad_init.F new_code/gad_init.F | 
| 20 | 87a88,91 | 
| 21 | > C     Set up the two character io labels for GAD | 
| 22 | >       CALL GAD_MAKE_DLABEL_LIST( GAD_iolabel, | 
| 23 | >      &                           GAD_iolabel_nmax ) | 
| 24 | > | 
| 25 | Only in new_code/: gad_make_dlabel_list.F | 
| 26 | Only in new_code/: make_default_dlabel_list.F | 
| 27 | diff -b original_code/ptracers_diagnostics_fill.F new_code/ptracers_diagnostics_fill.F | 
| 28 | 44c44,45 | 
| 29 | <       DO N = 1,MIN(99,PTRACERS_numInUse) | 
| 30 | --- | 
| 31 | > C     DO N = 1,MIN(99,PTRACERS_numInUse) | 
| 32 | >       DO N = 1,PTRACERS_numInUse | 
| 33 | 47c48,49 | 
| 34 | <         WRITE(diagname,'(A4,I2.2)') 'TRAC',N | 
| 35 | --- | 
| 36 | > C       WRITE(diagname,'(A4,I2.2)') 'TRAC',N | 
| 37 | >         WRITE(diagname,'(A4,A2)') 'TRAC',PTRACER_iolabel(N) | 
| 38 | 52c54,55 | 
| 39 | <         WRITE(diagname,'(A5,I2.2)') 'UTRAC',N | 
| 40 | --- | 
| 41 | > C       WRITE(diagname,'(A5,I2.2)') 'UTRAC',N | 
| 42 | >         WRITE(diagname,'(A5,A2)') 'UTRAC',PTRACER_iolabel(N) | 
| 43 | 72c75,76 | 
| 44 | <         WRITE(diagname,'(A5,I2.2)') 'VTRAC',N | 
| 45 | --- | 
| 46 | > C       WRITE(diagname,'(A5,I2.2)') 'VTRAC',N | 
| 47 | >         WRITE(diagname,'(A5,A2)') 'VTRAC',PTRACER_iolabel(N) | 
| 48 | 92c96,97 | 
| 49 | <         WRITE(diagname,'(A5,I2.2)') 'WTRAC',N | 
| 50 | --- | 
| 51 | > C       WRITE(diagname,'(A5,I2.2)') 'WTRAC',N | 
| 52 | >         WRITE(diagname,'(A5,A2)') 'WTRAC',PTRACER_iolabel(N) | 
| 53 | diff -b original_code/ptracers_diagnostics_init.F new_code/ptracers_diagnostics_init.F | 
| 54 | 64c64,65 | 
| 55 | <       DO iTrc=1,MIN(99,PTRACERS_num) | 
| 56 | --- | 
| 57 | > C     DO iTrc=1,MIN(99,PTRACERS_num) | 
| 58 | >       DO iTrc=1,PTRACERS_num | 
| 59 | 67c68,69 | 
| 60 | <        WRITE(locName,'(A,I2,A)') 'Tracer ',iTrc | 
| 61 | --- | 
| 62 | > C      WRITE(locName,'(A,I2,A)') 'Tracer ',iTrc | 
| 63 | >        WRITE(locName,'(A,A2,A)') 'Tracer ',PTRACER_iolabel(iTrc) | 
| 64 | 89c91,92 | 
| 65 | <        WRITE(diagName,'(A,I2.2,A)') 'TRAC',iTrc,'  ' | 
| 66 | --- | 
| 67 | > C      WRITE(diagName,'(A,I2.2,A)') 'TRAC',iTrc,'  ' | 
| 68 | >        WRITE(diagName,'(A,A2,A)') 'TRAC',PTRACER_iolabel(iTrc),'  ' | 
| 69 | 96c99,100 | 
| 70 | <        WRITE(diagName,'(A,I2.2,A)') 'UTRAC',iTrc,' ' | 
| 71 | --- | 
| 72 | > C      WRITE(diagName,'(A,I2.2,A)') 'UTRAC',iTrc,' ' | 
| 73 | >        WRITE(diagName,'(A,A2,A)') 'UTRAC',PTRACER_iolabel(iTrc),' ' | 
| 74 | 104c108,109 | 
| 75 | <        WRITE(diagName,'(A,I2.2,A)') 'VTRAC',iTrc,' ' | 
| 76 | --- | 
| 77 | > C      WRITE(diagName,'(A,I2.2,A)') 'VTRAC',iTrc,' ' | 
| 78 | >        WRITE(diagName,'(A,A2,A)') 'VTRAC',PTRACER_iolabel(iTrc),' ' | 
| 79 | 112c117,118 | 
| 80 | <        WRITE(diagName,'(A,I2.2,A)') 'WTRAC',iTrc,' ' | 
| 81 | --- | 
| 82 | > C      WRITE(diagName,'(A,I2.2,A)') 'WTRAC',iTrc,' ' | 
| 83 | >        WRITE(diagName,'(A,A2,A)') 'WTRAC',PTRACER_iolabel(iTrc),' ' | 
| 84 | 124a131 | 
| 85 | >        diagSufx(3:4) = PTRACER_iolabel(iTrc) | 
| 86 | diff -b original_code/PTRACERS.h new_code/PTRACERS.h | 
| 87 | 46a47 | 
| 88 | >       CHARACTER*2              PTRACERS_iolabel(PTRACERS_num) | 
| 89 | 77c78,79 | 
| 90 | <      &     PTRACERS_pickup_write_mnc, PTRACERS_pickup_read_mnc | 
| 91 | --- | 
| 92 | >      &     PTRACERS_pickup_write_mnc, PTRACERS_pickup_read_mnc, | 
| 93 | >      &     PTRACERS_iolabel | 
| 94 | diff -b original_code/ptracers_init_fixed.F new_code/ptracers_init_fixed.F | 
| 95 | 72a73,76 | 
| 96 | > C     Set up the two character io labels for PTRACERS | 
| 97 | >       CALL PTRACERS_MAKE_DLABEL_LIST( PTRACERS_iolabel, | 
| 98 | >      &                                PTRACERS_numInUse ) | 
| 99 | > | 
| 100 | Only in new_code/: ptracers_make_dlabel_list.F | 
| 101 | diff -b original_code/ptracers_write_state.F new_code/ptracers_write_state.F | 
| 102 | 93c93,94 | 
| 103 | <           WRITE(pref,'(A7,I2.2)') 'PTRACER',iTracer | 
| 104 | --- | 
| 105 | > C         WRITE(pref,'(A7,I2.2)') 'PTRACER',iTracer | 
| 106 | >           WRITE(pref,'(A7,A2)') 'PTRACER',PTRACER_iolabel(iTracer) |