Changeset 7271 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO
- Timestamp:
- 2016-11-18T16:24:30+01:00 (7 years ago)
- Location:
- branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90
r7254 r7271 381 381 !! 2D var for new CMIP6 diagnostics (behind a key_roam ifdef for simplicity) 382 382 REAL(wp), POINTER, DIMENSION(:,: ) :: fgco2, intdissic, intdissin, intdissisi, inttalk, o2min, zo2min 383 REAL(wp), POINTER, DIMENSION(:,:, ) :: fbddtalk, fbddtdic, fbddtdife, fbddtdin, fbddtdisi 383 384 !! 384 385 !! 3D var for new CMIP6 diagnostics … … 1030 1031 zo2min(:,:) = 0.0 !! 1031 1032 ENDIF 1033 IF( med_diag%FBDDTALK%dgsave ) THEN 1034 CALL wrk_alloc( jpi, jpj, fbddtalk ) 1035 fbddtalk(:,:) = 0.0 !! 1036 ENDIF 1037 IF( med_diag%FBDDTDIC%dgsave ) THEN 1038 CALL wrk_alloc( jpi, jpj, fbddtdic ) 1039 fbddtdic(:,:) = 0.0 !! 1040 ENDIF 1041 IF( med_diag%FBDDTDIFE%dgsave ) THEN 1042 CALL wrk_alloc( jpi, jpj, fbddtdife ) 1043 fbddtdife(:,:) = 0.0 !! 1044 ENDIF 1045 IF( med_diag%FBDDTDIN%dgsave ) THEN 1046 CALL wrk_alloc( jpi, jpj, fbddtdin ) 1047 fbddtdin(:,:) = 0.0 !! 1048 ENDIF 1049 IF( med_diag%FBDDTDISI%dgsave ) THEN 1050 CALL wrk_alloc( jpi, jpj, fbddtdisi ) 1051 fbddtdisi(:,:) = 0.0 !! 1052 ENDIF 1032 1053 !! 1033 1054 !! AXY (10/11/16): CMIP6 diagnostics, 3D … … 3803 3824 endif 3804 3825 3805 !! AXY (09/11/16): CMIP6 diagnostics 3806 IF( med_diag%BDDTALK3%dgsave ) THEN 3826 !! AXY (18/11/16): CMIP6 diagnostics 3827 IF( med_diag%FBDDTALK%dgsave ) THEN 3828 fbddtalk(ji,jj) = fbddtalk(ji,jj) + (btra(jpalk) * fthk) 3829 ENDIF 3830 IF( med_diag%FBDDTDIC%dgsave ) THEN 3831 fbddtdic(ji,jj) = fbddtdic(ji,jj) + (btra(jpdic) * fthk) 3832 ENDIF 3833 IF( med_diag%FBDDTDIFE%dgsave ) THEN 3834 fbddtdife(ji,jj) = fbddtdife(ji,jj) + (btra(jpfer) * fthk) 3835 ENDIF 3836 IF( med_diag%FBDDTDIN%dgsave ) THEN 3837 fbddtdin(ji,jj) = fbddtdin(ji,jj) + (btra(jpdin) * fthk) 3838 ENDIF 3839 IF( med_diag%FBDDTDISI%dgsave ) THEN 3840 fbddtdisi(ji,jj) = fbddtdisi(ji,jj) + (btra(jpsil) * fthk) 3841 ENDIF 3842 !! 3843 IF( med_diag%BDDTALK3%dgsave ) THEN 3807 3844 bddtalk3(ji,jj,jk) = btra(jpalk) 3808 3845 ENDIF 3809 IF( med_diag%BDDTDIC3%dgsave ) THEN3846 IF( med_diag%BDDTDIC3%dgsave ) THEN 3810 3847 bddtdic3(ji,jj,jk) = btra(jpdic) 3811 3848 ENDIF … … 3813 3850 bddtdife3(ji,jj,jk) = btra(jpfer) 3814 3851 ENDIF 3815 IF( med_diag%BDDTDIN3%dgsave ) THEN3852 IF( med_diag%BDDTDIN3%dgsave ) THEN 3816 3853 bddtdin3(ji,jj,jk) = btra(jpdin) 3817 3854 ENDIF … … 5792 5829 CALL wrk_dealloc( jpi, jpj, zo2min ) 5793 5830 ENDIF 5831 IF( med_diag%FBDDTALK%dgsave ) THEN 5832 CALL iom_put( "FBDDTALK" , fbddtalk ) 5833 CALL wrk_dealloc( jpi, jpj, fbddtalk ) 5834 ENDIF 5835 IF( med_diag%FBDDTDIC%dgsave ) THEN 5836 CALL iom_put( "FBDDTDIC" , fbddtdic ) 5837 CALL wrk_dealloc( jpi, jpj, fbddtdic ) 5838 ENDIF 5839 IF( med_diag%FBDDTDIFE%dgsave ) THEN 5840 CALL iom_put( "FBDDTDIFE" , fbddtdife ) 5841 CALL wrk_dealloc( jpi, jpj, fbddtdife ) 5842 ENDIF 5843 IF( med_diag%FBDDTDIN%dgsave ) THEN 5844 CALL iom_put( "FBDDTDIN" , fbddtdin ) 5845 CALL wrk_dealloc( jpi, jpj, fbddtdin ) 5846 ENDIF 5847 IF( med_diag%FBDDTDISI%dgsave ) THEN 5848 CALL iom_put( "FBDDTDISI" , fbddtdisi ) 5849 CALL wrk_dealloc( jpi, jpj, fbddtdisi ) 5850 ENDIF 5794 5851 !! 5795 5852 !! AXY (09/11/16): 3D CMIP6 diagnostics -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcnam_medusa.F90
r7254 r7271 2184 2184 med_diag%ZO2min%dgsave = .FALSE. 2185 2185 ENDIF 2186 IF (iom_use("FBDDTALK")) THEN 2187 med_diag%FBDDTALK%dgsave = .TRUE. 2188 ELSE 2189 med_diag%FBDDTALK%dgsave = .FALSE. 2190 ENDIF 2191 IF (iom_use("FBDDTDIC")) THEN 2192 med_diag%FBDDTDIC%dgsave = .TRUE. 2193 ELSE 2194 med_diag%FBDDTDIC%dgsave = .FALSE. 2195 ENDIF 2196 IF (iom_use("FBDDTDIFE")) THEN 2197 med_diag%FBDDTDIFE%dgsave = .TRUE. 2198 ELSE 2199 med_diag%FBDDTDIFE%dgsave = .FALSE. 2200 ENDIF 2201 IF (iom_use("FBDDTDISI")) THEN 2202 med_diag%FBDDTDISI%dgsave = .TRUE. 2203 ELSE 2204 med_diag%FBDDTDISI%dgsave = .FALSE. 2205 ENDIF 2186 2206 !! 2187 2207 !! 3D -
branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trc.F90
r7224 r7271 136 136 epC100, epCALC100, epN100, epSI100, & 137 137 FGCO2, INTDISSIC, INTDISSIN, INTDISSISI, INTTALK, O2min, ZO2min, & 138 FBDDTALK, FBDDTDIC, FBDDTDIFE, FBDDTDIN, FBDDTDISI, & 138 139 ! AXY (11/11/16): additional CMIP6 3D diagnostics 139 140 TPPD3, &
Note: See TracChangeset
for help on using the changeset viewer.