diff --git a/atmosphere/diagnostic_profiles/STASHC_spinup_concentrations b/atmosphere/diagnostic_profiles/STASHC_spinup_concentrations
new file mode 100644
index 0000000..d72d4ea
--- /dev/null
+++ b/atmosphere/diagnostic_profiles/STASHC_spinup_concentrations
@@ -0,0 +1,714 @@
+ ### Start of user STASH requests for ATMOS ### 
+ &STASHNUM NUM_REQ= 82, NUM_DOM=37,  NUM_TIM=20, NUM_USE=12 /
+
+ # Monthly - 3D variables on pressure levels #
+ &STREQ IMOD= 1, ISEC=30, ITEM=201, IDOM=36, ITIM=5, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=30, ITEM=202, IDOM=36, ITIM=5, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=30, ITEM=203, IDOM=36, ITIM=5, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=30, ITEM=204, IDOM=36, ITIM=5, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=30, ITEM=205, IDOM=36, ITIM=5, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=30, ITEM=206, IDOM=36, ITIM=5, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=30, ITEM=207, IDOM=36, ITIM=5, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=30, ITEM=301, IDOM=36, ITIM=3, IUSE=2 /  
+
+ # Monthly - 2D surface variables #
+ &STREQ IMOD= 1, ISEC=0, ITEM=33, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=0, ITEM=30, IDOM=1, ITIM=5, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=395, IDOM=1, ITIM=5, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=0, ITEM=24, IDOM=1, ITIM=3, IUSE=2 / 
+ &STREQ IMOD= 1, ISEC=0, ITEM=507, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=236, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=237, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=245, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=16, ITEM=222, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=0, ITEM=409, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=225, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=226, IDOM=1, ITIM=3, IUSE=2 / 
+ &STREQ IMOD= 1, ISEC=3, ITEM=209, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=210, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=227, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=230, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=460, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=461, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=5, ITEM=216, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=223, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=296, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=297, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=208, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=234, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=235, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=1, ITEM=201, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=1, ITEM=210, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=1, ITEM=211, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=1, ITEM=235, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=2, ITEM=201, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=2, ITEM=203, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=2, ITEM=207, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=2, ITEM=208, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=217, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=234, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=23, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=0, ITEM=23, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=0, ITEM=31, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=0, ITEM=32, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=0, ITEM=508, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=0, ITEM=509, IDOM=1, ITIM=3, IUSE=2 / 
+ &STREQ IMOD= 1, ISEC=3, ITEM=261, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=262, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=263, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=293, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=100, IDOM=1, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=101, IDOM=1, ITIM=3, IUSE=2 /
+
+ # Monthly - 2D non-surface #
+ &STREQ IMOD= 1, ISEC=1, ITEM=207, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=1, ITEM=208, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=1, ITEM=209, IDOM=1, ITIM=3, IUSE=2 /   
+ &STREQ IMOD= 1, ISEC=2, ITEM=205, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=2, ITEM=206, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=332, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=2, ITEM=204, IDOM=1, ITIM=3, IUSE=2 /  
+ 
+ # Monthly - variables on soil levels #
+ &STREQ IMOD= 1, ISEC=8, ITEM=223, IDOM=5, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=225, IDOM=5, ITIM=3, IUSE=2 /  
+
+ # Monthly - variables on tiles - CNP cycles #
+ &STREQ IMOD= 1, ISEC=3, ITEM=289, IDOM=14, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=291, IDOM=14, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=292, IDOM=14, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=851, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=852, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=853, IDOM=10, ITIM=20, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=854, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=855, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=856, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=857, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=858, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=859, IDOM=10, ITIM=20, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=860, IDOM=10, ITIM=20, IUSE=2 /
+
+ 
+ # Monthly - variables on tiles - other #
+ &STREQ IMOD= 1, ISEC=3, ITEM=287, IDOM=10, ITIM=3, IUSE=2 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=288, IDOM=10, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=317, IDOM=10, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=318, IDOM=14, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=893, IDOM=10, ITIM=3, IUSE=2 /
+
+
+ &TIME NAME="TDAYMN", ITYP=3
+ INTV=1,UNT1="DA",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DA",
+ /
+
+ &TIME NAME="TDAILY", ITYP=1
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DA",
+ /
+
+ &TIME NAME="TDMPMN", ITYP=3
+ INTV=1,UNT1="DU",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DU",
+ /
+
+ &TIME NAME="T6H", ITYP=1
+ IOPT=1,
+ ISTR=6,IEND=-1,IFRE=6,UNT3="H ",
+ /
+
+ &TIME NAME="T6HDM", ITYP=3
+ INTV=1,UNT1="DU",IOFF=0,ISAM=6,UNT2="H ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DU",
+ /
+
+ &TIME NAME="TALLTS", ITYP=1
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="T ",
+ /
+
+ &TIME NAME="T3H", ITYP=1
+ IOPT=1,
+ ISTR=3,IEND=-1,IFRE=3,UNT3="H ",
+ /
+
+ &TIME NAME="T3HMN", ITYP=3
+ INTV=3,UNT1="H ",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=3,IEND=-1,IFRE=3,UNT3="H ",
+ /
+
+ &TIME NAME="TCOUPMN", ITYP=3
+ INTV=1,UNT1="DA",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DA",
+ /
+
+ &TIME NAME="TSW", ITYP=1
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=6,UNT3="T ",
+ /
+
+ &TIME NAME="TTRIFdyn", ITYP=1
+ IOPT=1,
+ ISTR=480,IEND=-1,IFRE=480,UNT3="T ",
+ /
+
+ &TIME NAME="TDALYMIN", ITYP=6
+ INTV=1,UNT1="DA",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DA",
+ /
+
+ &TIME NAME="TDALYMAX", ITYP=5
+ INTV=1,UNT1="DA",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DA",
+ /
+
+ &TIME NAME="TTRIFphn", ITYP=3
+ INTV=1,UNT1="DU",IOFF=48,ISAM=48,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DU",
+ /
+
+ &TIME NAME="T24H0Z", ITYP=1
+ IOPT=1,
+ ISTR=24,IEND=-1,IFRE=24,UNT3="H ",
+ /
+
+ &TIME NAME="T24HRMRV", ITYP=3
+ INTV=1,UNT1="DU",IOFF=24,ISAM=24,UNT2="H ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DU",
+ /
+
+ &TIME NAME="T6HDMmon", ITYP=3
+ INTV=1,UNT1="DU",IOFF=0,ISAM=6,UNT2="H ",
+ IOPT=1,
+ ISTR=30,IEND=-1,IFRE=30,UNT3="DA",
+ /
+
+ &TIME NAME="TMONMN", ITYP=3
+ INTV=30,UNT1="DA",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=30,IEND=-1,IFRE=30,UNT3="DA",
+ /
+
+ &TIME NAME="TSERIES", ITYP=4
+ INTV=1,UNT1="DA",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DA",
+ /
+
+ &TIME NAME="TMON", ITYP=1
+ IOPT=1,
+ ISTR=1,IEND=-1,IFRE=1,UNT3="DU",
+ /
+
+ &DOMAIN NAME="DIAG", IOPL=5
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DALLTH", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DPBLTH", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=12,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP17", IOPL=3
+ RLEVLST=1000.000,925.000,850.000,700.000,600.000,500.000,
+ 400.000,300.000,250.000,200.000,150.000,100.000,70.000,50.000,30.000,20.000,
+ 10.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DSOIL", IOPL=6
+ ILEVS=1,
+ LEVB=1,
+ LEVT=6,
+ PLT=0,
+ IOPA=1,
+ IMSK=2, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DBOTTH", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=1,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="D500", IOPL=3
+ RLEVLST=500.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DALLRH", IOPL=1
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DALLCL", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DTILE", IOPL=5
+ PLT=9,
+ PSLIST=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DPBLTH0", IOPL=2
+ ILEVS=1,
+ LEVB=0,
+ LEVT=11,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DA7ISCCP", IOPL=3
+ RLEVLST=900.000, 740.000, 620.000, 500.000, 375.000, 245.000, 115.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DPSEUD", IOPL=5
+ PLT=10,
+ PSLIST=1,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DPFT", IOPL=5
+ PLT=9,
+ PSLIST=1,2,3,4,5,6,7,8,9,10,11,12,13,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DTILEURB", IOPL=5
+ PLT=9,
+ PSLIST=3,6,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DIAG_AOT", IOPL=5
+ PLT=1,
+ PSLIST=1,2,3,4,5,6,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="Dtype", IOPL=5
+ PLT=9,
+ PSLIST=1,2,3,4,5,6,7,8,9,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP6", IOPL=3
+ RLEVLST=1000.000,850.000,700.000,500.000,250.000,100.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="D8550252", IOPL=3
+ RLEVLST=850.000,500.000,250.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DBOTRHO", IOPL=1
+ ILEVS=1,
+ LEVB=1,
+ LEVT=1,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="D200", IOPL=3
+ RLEVLST=200.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP31zm", IOPL=3
+ RLEVLST=1000.000,850.000,700.000,500.000,400.000,300.000,
+ 250.000,200.000,170.000,150.000,130.000,115.000,100.000,90.000,80.000,70.000,
+ 50.000,30.000,20.000,15.000,10.000,7.000,5.000,3.000,2.000,1.500,1.000,0.500,
+ 0.300,0.200,0.100,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=2, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP3", IOPL=3
+ RLEVLST=1000.000,100.000,10.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DTHETA7", IOPL=7
+ RLEVLST=315.000,330.000,350.000,380.000,405.000,460.000,
+ 840.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP10hPa", IOPL=3
+ RLEVLST=10.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP7", IOPL=3
+ RLEVLST=1000.000,850.000,700.000,500.000,250.000,100.000,
+ 10.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DALLTHzm", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=2, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DALLRHzm", IOPL=1
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=2, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DTOPSOIL", IOPL=6
+ ILEVS=1,
+ LEVB=1,
+ LEVT=1,
+ PLT=0,
+ IOPA=1,
+ IMSK=2, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP17zm", IOPL=3
+ RLEVLST=1000.000,925.000,850.000,700.000,600.000,500.000,
+ 400.000,300.000,250.000,200.000,150.000,100.000,70.000,50.000,30.000,20.000,
+ 10.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=2, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP8", IOPL=3
+ RLEVLST=1000.000,850.000,700.000,500.000,250.000,100.000,
+ 50.000,10.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DP17th", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="DGTS_PT", IOPL=5
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TNLIM=71,45,60,108,91,122,77,69,44,114,105,92,101,102,
+ 115,107,118,113,9,9,9,
+ TSLIM=71,45,60,108,91,122,77,69,44,114,105,92,101,102,
+ 115,107,118,113,9,9,9,
+ TWLIM=161,78,72,192,45,14,12,12,80,8,146,61,141,148,4,
+ 155,140,4,14,73,137,
+ TELIM=161,78,72,192,45,14,12,12,80,8,146,61,141,148,4,
+ 155,140,4,14,73,137,
+ TS="Y", TSNUM=21,
+ /
+
+ &DOMAIN NAME="DCO2TS", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="Y", TSNUM=57,
+ TBLIM=1,1,1,1,1,1,9,1,1,1,2,1,1,2,3,4,10,1,1,2,3,4,1,
+ 13,1,10,1,2,3,12,1,6,1,1,1,1,5,3,1,2,3,4,1,1,1,1,1,1,1,1,1,1,1,1,2,3,1,
+ TTLIM=1,1,1,1,1,1,9,1,1,1,2,1,1,2,3,4,10,1,1,2,3,4,1,
+ 13,1,10,1,2,3,12,1,6,1,1,1,1,5,3,1,2,3,4,1,1,1,1,1,1,1,1,1,1,1,1,2,3,1,
+ TNLIM=137,43,40,129,40,39,108,108,46,113,113,92,111,
+ 111,111,111,96,10,110,110,110,110,116,89,92,105,127,127,127,110,104,111,62,1,
+ 18,117,102,136,115,115,115,115,122,102,113,101,116,42,43,54,63,63,45,71,71,71,
+ 118,
+ TSLIM=137,43,40,129,40,39,108,108,46,113,113,92,111,
+ 111,111,111,96,10,110,110,110,110,116,89,92,105,127,127,127,110,104,111,62,1,
+ 18,117,102,136,115,115,115,115,122,102,113,101,116,42,43,54,63,63,45,71,71,71,
+ 118,
+ TWLIM=160,42,94,109,78,77,7,77,11,149,149,67,10,10,10,
+ 10,184,162,145,145,145,145,188,111,83,137,14,14,14,5,76,5,102,180,23,6,55,8,4,
+ 4,4,4,49,69,5,74,8,77,77,80,70,72,78,164,164,164,140,
+ TELIM=160,42,94,109,78,77,7,77,11,149,149,67,10,10,10,
+ 10,184,162,145,145,145,145,188,111,83,137,14,14,14,5,76,5,102,180,23,6,55,8,4,
+ 4,4,4,49,69,5,74,8,77,77,80,70,72,78,164,164,164,140,
+ /
+
+ &DOMAIN NAME="DCO2TSL", IOPL=5
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TNLIM=137,43,40,129,40,39,108,108,46,113,92,111,96,10,
+ 110,116,89,92,105,127,110,104,111,62,1,18,117,102,136,115,122,102,113,101,116,
+ 42,43,54,63,63,45,71,118,
+ TSLIM=137,43,40,129,40,39,108,108,46,113,92,111,96,10,
+ 110,116,89,92,105,127,110,104,111,62,1,18,117,102,136,115,122,102,113,101,116,
+ 42,43,54,63,63,45,71,118,
+ TWLIM=160,42,94,109,78,77,7,77,11,149,67,10,184,162,
+ 145,188,111,83,137,14,5,76,5,102,180,23,6,55,8,4,49,69,5,74,8,77,77,80,70,72,
+ 78,164,140,
+ TELIM=160,42,94,109,78,77,7,77,11,149,67,10,184,162,
+ 145,188,111,83,137,14,5,76,5,102,180,23,6,55,8,4,49,69,5,74,8,77,77,80,70,72,
+ 78,164,140,
+ TS="Y", TSNUM=43,
+ /
+
+ &DOMAIN NAME="PLEV19", IOPL=3
+ RLEVLST=1000.000,925.000,850.000,700.000,600.000,500.000,
+ 400.000,300.000,250.000,200.000,150.000,100.000,70.000,50.000,30.000,20.000,
+ 10.000,5.000,1.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &DOMAIN NAME="PLEV3", IOPL=3
+ RLEVLST=850.000,500.000,250.000,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &USE NAME="Upedaily", LOCN=3
+ IUNT=64,
+ /
+
+ &USE NAME="Upamonth", LOCN=3
+ IUNT=60,
+ /
+
+ &USE NAME="UPUKCA", LOCN=1
+ IUNT=98,
+ /
+
+ &USE NAME="UPI3hrly", LOCN=3
+ IUNT=68,
+ /
+
+ &USE NAME="UPJuser", LOCN=3
+ IUNT=69,
+ /
+
+ &USE NAME="UPA2O", LOCN=1
+ IUNT=10,
+ /
+
+ &USE NAME="UPCuser", LOCN=3
+ IUNT=62,
+ /
+
+ &USE NAME="UPEuser", LOCN=3
+ IUNT=64,
+ /
+
+ &USE NAME="UPFuser", LOCN=3
+ IUNT=65,
+ /
+
+ &USE NAME="Upi3hr", LOCN=3
+ IUNT=68,
+ /
+
+ &USE NAME="Upi6hrly", LOCN=3
+ IUNT=69,
+ /
+
+ &USE NAME="UPGuser", LOCN=3
+ IUNT=66,
+ /
+
+ ### End of user STASH requests for ATMOS ### 
+ ### Start of Atmos-Ocean Coupling Macro. ###
+ &STASHNUM NUM_REQ=23, NUM_DOM=4,  NUM_TIM=2, NUM_USE=1 / 
+  
+ &STREQ IMOD= 1, ISEC=0, ITEM=252, ITIM=1, IDOM=4, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=0, ITEM=409, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=1, ITEM=201, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=1, ITEM=203, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=1, ITEM=260, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=2, ITEM=201, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=2, ITEM=203, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=225, IDOM=1, ITIM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=210, IDOM=1, ITIM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=217, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=228, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=392, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=394, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=224, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=232, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=256, ITIM=1, IDOM=2, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=257, ITIM=1, IDOM=2, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=353, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=4, ITEM=203, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=4, ITEM=204, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=5, ITEM=205, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=5, ITEM=206, ITIM=1, IDOM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=26, ITEM=4, ITIM=2, IDOM=1, IUSE=1 /
+
+ &TIME NAME="T3HRMN", ITYP=3
+ INTV=6,UNT1="T ",IOFF=0,ISAM=1,UNT2="T ",
+ IOPT=1,
+ ISTR=6,IEND=-1,IFRE=6,UNT3="T "
+ /
+
+ &TIME NAME="T3HR", ITYP=1
+ IOPT=1,
+ ISTR=6,IEND=-1,IFRE=6,UNT3="T "
+ /
+
+ &DOMAIN NAME="DIAG", IOPL=5
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0
+ /
+ 
+ &DOMAIN NAME="DPSEUD", IOPL=5,
+ PLT=10,
+ PSLIST=1,2,3,4,5,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0
+ /
+ 
+ &DOMAIN NAME="mthl", IOPL=2,
+ ILEVS=1,
+ LEVB=1,
+ LEVT=12,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+ 
+ &DOMAIN NAME="DALLTH", IOPL=2
+ ILEVS=1,
+ LEVB=1,
+ LEVT=38,
+ PLT=0,
+ IOPA=1,
+ IMSK=1, IMN=0, IWT=0,
+ TS="N",TSNUM=0,
+ /
+
+ &USE NAME="UPCOUP", LOCN=1,
+ IUNT=10
+ /
+
+ ### End of Atmos-Ocean Coupling Macro. ###
+
+ 
+ &STASHNUM NUM_REQ=-1, NUM_DOM=0,  NUM_TIM=0, NUM_USE=0 /   
+
+ &USTSNUM 
+ N_USTASH= 1 , NRECS_USTASH= 234 ,
+ USTSFILS= "PRESM_A" /
diff --git a/ice/diagnostic_profiles/ice_history_spinup.nml b/ice/diagnostic_profiles/ice_history_spinup.nml
new file mode 100644
index 0000000..7a09baa
--- /dev/null
+++ b/ice/diagnostic_profiles/ice_history_spinup.nml
@@ -0,0 +1,126 @@
+&setup_nml
+  , histfreq       = 'd','m','x','x','x'
+  , histfreq_n     = 1, 1, 1, 1, 1
+  , hist_avg       = .true.
+/
+
+! Please note, the following diagnostics are affected by
+! issues in ACCESS ESM1.5 and have been disabled from the output:
+! fsalt_ai, daidtd, daidtt, dvidtd, congel, frazil, meltl, meltb,
+! meltt, snoice, dvidtt, fswthru_ai, Tsfc.
+
+&icefields_nml
+    f_tmask        = .true.
+  , f_tarea        = .true.
+  , f_uarea        = .true.
+  , f_dxt          = .false.
+  , f_dyt          = .false.
+  , f_dxu          = .false.
+  , f_dyu          = .false.
+  , f_HTN          = .false.
+  , f_HTE          = .false.
+  , f_ANGLE        = .true.
+  , f_ANGLET       = .true.
+  , f_NCAT         = .true.
+  , f_VGRDi        = .true.
+  , f_VGRDs        = .true.
+  , f_bounds       = .false.
+  , f_hi           = 'm'
+  , f_hs           = 'x' 
+  , f_Tsfc         = 'x' 
+  , f_aice         = 'm' 
+  , f_uvel         = 'm' 
+  , f_vvel         = 'm' 
+  , f_fswdn        = 'x' 
+  , f_flwdn        = 'x'
+  , f_snow         = 'x' 
+  , f_snow_ai      = 'x' 
+  , f_rain         = 'x' 
+  , f_rain_ai      = 'x' 
+  , f_sst          = 'x' 
+  , f_sss          = 'x' 
+  , f_uocn         = 'x' 
+  , f_vocn         = 'x' 
+  , f_frzmlt       = 'x'
+  , f_fswfac       = 'x'
+  , f_fswabs       = 'x' 
+  , f_fswabs_ai    = 'x' 
+  , f_albsni       = 'x' 
+  , f_alvdr        = 'x'
+  , f_alidr        = 'x'
+  , f_albice       = 'x'
+  , f_albsno       = 'x'
+  , f_albpnd       = 'x'
+  , f_coszen       = 'x'
+  , f_flat         = 'x' 
+  , f_flat_ai      = 'x' 
+  , f_fsens        = 'x' 
+  , f_fsens_ai     = 'x' 
+  , f_flwup        = 'x' 
+  , f_flwup_ai     = 'x' 
+  , f_evap         = 'x' 
+  , f_evap_ai      = 'x' 
+  , f_Tair         = 'x' 
+  , f_Tref         = 'x' 
+  , f_Qref         = 'x'
+  , f_congel       = 'x' 
+  , f_frazil       = 'x' 
+  , f_snoice       = 'x' 
+  , f_meltt        = 'x'
+  , f_meltb        = 'x'
+  , f_meltl        = 'x'
+  , f_fresh        = 'x'
+  , f_fresh_ai     = 'x'
+  , f_fsalt        = 'x'
+  , f_fsalt_ai     = 'x'
+  , f_fhocn        = 'x' 
+  , f_fhocn_ai     = 'x' 
+  , f_fswthru      = 'x' 
+  , f_fswthru_ai   = 'x' 
+  , f_fsurf_ai     = 'x'
+  , f_fcondtop_ai  = 'x'
+  , f_fmeltt_ai    = 'x' 
+  , f_strairx      = 'x' 
+  , f_strairy      = 'x' 
+  , f_strtltx      = 'x' 
+  , f_strtlty      = 'x' 
+  , f_strcorx      = 'x' 
+  , f_strcory      = 'x' 
+  , f_strocnx      = 'x' 
+  , f_strocny      = 'x' 
+  , f_strintx      = 'x' 
+  , f_strinty      = 'x'
+  , f_strength     = 'x'
+  , f_divu         = 'x'
+  , f_shear        = 'x'
+  , f_sig1         = 'x' 
+  , f_sig2         = 'x' 
+  , f_dvidtt       = 'x' 
+  , f_dvidtd       = 'x' 
+  , f_daidtt       = 'x'
+  , f_daidtd       = 'x' 
+  , f_mlt_onset    = 'x'
+  , f_frz_onset    = 'x'
+  , f_dardg1dt     = 'x'
+  , f_dardg2dt     = 'x'
+  , f_dvirdgdt     = 'x'
+  , f_opening      = 'x'
+  , f_hisnap       = 'x'
+  , f_aisnap       = 'x'
+  , f_trsig        = 'x'
+  , f_icepresent   = 'x'
+  , f_iage         = 'x'
+  , f_alvl         = 'x'
+  , f_vlvl         = 'x'
+  , f_ardg         = 'x'
+  , f_vrdg         = 'x'
+  , f_aicen        = 'x'
+  , f_vicen        = 'x'
+  , f_Tinz         = 'x'
+  , f_Tsnz         = 'x'
+  , f_fsurfn_ai    = 'x'
+  , f_fcondtopn_ai = 'x'
+  , f_fmelttn_ai   = 'x'
+  , f_flatn_ai     = 'x'
+  , f_apondn       = 'x'
+/
diff --git a/ocean/diagnostic_profiles/diag_table_detailed b/ocean/diagnostic_profiles/diag_table_detailed
index 11e8aeb..dc646ba 100644
--- a/ocean/diagnostic_profiles/diag_table_detailed
+++ b/ocean/diagnostic_profiles/diag_table_detailed
@@ -535,6 +535,18 @@ ACCESS-ESM_CMIP6
 "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "hblt", "hblt", "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", "all", "max", "none", 2
 
+"ocean-2d-temp_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "temp_yflux_adv_int_z", "temp_yflux_adv_int_z", "ocean-2d-temp_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-temp_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "temp_xflux_adv_int_z", "temp_xflux_adv_int_z", "ocean-2d-temp_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-salt_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "salt_yflux_adv_int_z", "salt_yflux_adv_int_z", "ocean-2d-salt_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-salt_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "salt_xflux_adv_int_z", "salt_xflux_adv_int_z", "ocean-2d-salt_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
 
 # monthly 2d BGC fields
 
diff --git a/ocean/diagnostic_profiles/diag_table_spinup b/ocean/diagnostic_profiles/diag_table_spinup
new file mode 100644
index 0000000..a1198bf
--- /dev/null
+++ b/ocean/diagnostic_profiles/diag_table_spinup
@@ -0,0 +1,423 @@
+ACCESS-ESM_CMIP6
+1 1 1 0 0 0
+
+#########################################################################################################
+#                                                                                                       #
+# DO NOT EDIT! Instead, edit diag_table_source.yaml and run make_diag_table.py to re-generate this file #
+#                                                                                                       #
+#########################################################################################################
+
+
+# static 2d grid data
+
+"ocean-2d-area_t", -1, "months", 1, "days", "time"
+"ocean_model", "area_t", "area_t", "ocean-2d-area_t", "all", "none", "none", 2
+
+"ocean-2d-area_u", -1, "months", 1, "days", "time"
+"ocean_model", "area_u", "area_u", "ocean-2d-area_u", "all", "none", "none", 2
+
+"ocean-2d-geolat_c", -1, "months", 1, "days", "time"
+"ocean_model", "geolat_c", "geolat_c", "ocean-2d-geolat_c", "all", "none", "none", 2
+
+"ocean-2d-geolat_t", -1, "months", 1, "days", "time"
+"ocean_model", "geolat_t", "geolat_t", "ocean-2d-geolat_t", "all", "none", "none", 2
+
+"ocean-2d-geolon_c", -1, "months", 1, "days", "time"
+"ocean_model", "geolon_c", "geolon_c", "ocean-2d-geolon_c", "all", "none", "none", 2
+
+"ocean-2d-geolon_t", -1, "months", 1, "days", "time"
+"ocean_model", "geolon_t", "geolon_t", "ocean-2d-geolon_t", "all", "none", "none", 2
+
+"ocean-2d-ht", -1, "months", 1, "days", "time"
+"ocean_model", "ht", "ht", "ocean-2d-ht", "all", "none", "none", 2
+
+"ocean-2d-hu", -1, "months", 1, "days", "time"
+"ocean_model", "hu", "hu", "ocean-2d-hu", "all", "none", "none", 2
+
+"ocean-2d-kmt", -1, "months", 1, "days", "time"
+"ocean_model", "kmt", "kmt", "ocean-2d-kmt", "all", "none", "none", 2
+
+"ocean-2d-kmu", -1, "months", 1, "days", "time"
+"ocean_model", "kmu", "kmu", "ocean-2d-kmu", "all", "none", "none", 2
+
+"ocean-2d-pbot0", -1, "months", 1, "days", "time"
+"ocean_model", "pbot0", "pbot0", "ocean-2d-pbot0", "all", "none", "none", 2
+
+"ocean-2d-tide_speed_wave", -1, "months", 1, "days", "time"
+"ocean_model", "tide_speed_wave", "tide_speed_wave", "ocean-2d-tide_speed_wave", "all", "none", "none", 2
+
+"ocean-2d-roughness_length", -1, "months", 1, "days", "time"
+"ocean_model", "roughness_length", "roughness_length", "ocean-2d-roughness_length", "all", "none", "none", 2
+
+"ocean-2d-roughness_amp", -1, "months", 1, "days", "time"
+"ocean_model", "roughness_amp", "roughness_amp", "ocean-2d-roughness_amp", "all", "none", "none", 2
+
+"ocean-2d-visc_crit_bih", -1, "months", 1, "days", "time"
+"ocean_model", "visc_crit_bih", "visc_crit_bih", "ocean-2d-visc_crit_bih", "all", "none", "none", 2
+
+"ocean-2d-tide_speed_drag", -1, "months", 1, "days", "time"
+"ocean_model", "tide_speed_drag", "tide_speed_drag", "ocean-2d-tide_speed_drag", "all", "none", "none", 2
+
+"ocean-2d-tide_speed_mask", -1, "months", 1, "days", "time"
+"ocean_model", "tide_speed_mask", "tide_speed_mask", "ocean-2d-tide_speed_mask", "all", "none", "none", 2
+
+
+# yearly 3d ocean fields
+
+"ocean-3d-tx_trans_rho-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tx_trans_rho", "tx_trans_rho", "ocean-3d-tx_trans_rho-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-tx_trans_rho_gm-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tx_trans_rho_gm", "tx_trans_rho_gm", "ocean-3d-tx_trans_rho_gm-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-tx_trans_gm-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tx_trans_gm", "tx_trans_gm", "ocean-3d-tx_trans_gm-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-tx_trans-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tx_trans", "tx_trans", "ocean-3d-tx_trans-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-tz_trans-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tz_trans", "tz_trans", "ocean-3d-tz_trans-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-tx_trans_submeso-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tx_trans_submeso", "tx_trans_submeso", "ocean-3d-tx_trans_submeso-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-ty_trans_submeso-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ty_trans_submeso", "ty_trans_submeso", "ocean-3d-ty_trans_submeso-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-neutral_rho-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "neutral_rho", "neutral_rho", "ocean-3d-neutral_rho-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-age_global-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "age_global", "age_global", "ocean-3d-age_global-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-rho-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "rho", "rho", "ocean-3d-rho-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-ty_trans-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ty_trans", "ty_trans", "ocean-3d-ty_trans-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-ty_trans_gm-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ty_trans_gm", "ty_trans_gm", "ocean-3d-ty_trans_gm-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-ty_trans_rho-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ty_trans_rho", "ty_trans_rho", "ocean-3d-ty_trans_rho-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-ty_trans_rho_gm-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ty_trans_rho_gm", "ty_trans_rho_gm", "ocean-3d-ty_trans_rho_gm-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-temp_vdiffuse_impl-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "temp_vdiffuse_impl", "temp_vdiffuse_impl", "ocean-3d-temp_vdiffuse_impl-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-salt_vdiffuse_impl-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "salt_vdiffuse_impl", "salt_vdiffuse_impl", "ocean-3d-salt_vdiffuse_impl-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-u-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "u", "u", "ocean-3d-u-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-v-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "v", "v", "ocean-3d-v-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-dzt-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "dzt", "dzt", "ocean-3d-dzt-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# yearly 3d BGC fields
+
+"oceanbgc-3d-no3-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "no3", "no3", "oceanbgc-3d-no3-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-phy-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "phy", "phy", "oceanbgc-3d-phy-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-o2-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "o2", "o2", "oceanbgc-3d-o2-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-det-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "det", "det", "oceanbgc-3d-det-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-zoo-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "zoo", "zoo", "oceanbgc-3d-zoo-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-caco3-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "caco3", "caco3", "oceanbgc-3d-caco3-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-dic-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "dic", "dic", "oceanbgc-3d-dic-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-alk-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "alk", "alk", "oceanbgc-3d-alk-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-adic-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "adic", "adic", "oceanbgc-3d-adic-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-fe-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "fe", "fe", "oceanbgc-3d-fe-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-3d-pprod_gross-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "pprod_gross", "pprod_gross", "oceanbgc-3d-pprod_gross-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# yearly 2d ocean fields
+
+"ocean-2d-sea_level-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "sea_level", "sea_level", "ocean-2d-sea_level-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-lprec-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "lprec", "lprec", "ocean-2d-lprec-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-fprec-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "fprec", "fprec", "ocean-2d-fprec-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-evap-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "evap", "evap", "ocean-2d-evap-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-runoff-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "runoff", "runoff", "ocean-2d-runoff-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-lw_heat-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "lw_heat", "lw_heat", "ocean-2d-lw_heat-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-evap_heat-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "evap_heat", "evap_heat", "ocean-2d-evap_heat-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-sens_heat-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "sens_heat", "sens_heat", "ocean-2d-sens_heat-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-swflx-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "swflx", "swflx", "ocean-2d-swflx-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-pme-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "pme", "pme", "ocean-2d-pme-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-pme_sbc-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "pme_sbc", "pme_sbc", "ocean-2d-pme_sbc-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-river-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "river", "river", "ocean-2d-river-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-sfc_hflux_pme-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "sfc_hflux_pme", "sfc_hflux_pme", "ocean-2d-sfc_hflux_pme-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-eta_t-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "eta_t", "eta_t", "ocean-2d-eta_t-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-bottom_temp-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "bottom_temp", "bottom_temp", "ocean-2d-bottom_temp-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-bottom_salt-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "bottom_salt", "bottom_salt", "ocean-2d-bottom_salt-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-bottom_age_global-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "bottom_age_global", "bottom_age_global", "ocean-2d-bottom_age_global-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-psiu-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "psiu", "psiu", "ocean-2d-psiu-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-ekman_we-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ekman_we", "ekman_we", "ocean-2d-ekman_we-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-psiv-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "psiv", "psiv", "ocean-2d-psiv-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-tau_curl-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "tau_curl", "tau_curl", "ocean-2d-tau_curl-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-eta_u-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "eta_u", "eta_u", "ocean-2d-eta_u-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-urhod-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "urhod", "urhod", "ocean-2d-urhod-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-vrhod-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "vrhod", "vrhod", "ocean-2d-vrhod-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-ubott-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "ubott", "ubott", "ocean-2d-ubott-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-vbott-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "vbott", "vbott", "ocean-2d-vbott-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-temp_yflux_adv_int_z-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "temp_yflux_adv_int_z", "temp_yflux_adv_int_z", "ocean-2d-temp_yflux_adv_int_z-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-temp_xflux_adv_int_z-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "temp_xflux_adv_int_z", "temp_xflux_adv_int_z", "ocean-2d-temp_xflux_adv_int_z-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-salt_yflux_adv_int_z-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "salt_yflux_adv_int_z", "salt_yflux_adv_int_z", "ocean-2d-salt_yflux_adv_int_z-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-salt_xflux_adv_int_z-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "salt_xflux_adv_int_z", "salt_xflux_adv_int_z", "ocean-2d-salt_xflux_adv_int_z-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# yearly 2d BGC fields
+
+"oceanbgc-2d-stf03-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "stf03", "stf03", "oceanbgc-2d-stf03-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-stf07-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "stf07", "stf07", "oceanbgc-2d-stf07-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-stf09-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "stf09", "stf09", "oceanbgc-2d-stf09-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-stf10-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "stf10", "stf10", "oceanbgc-2d-stf10-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-pco2-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "pco2", "pco2", "oceanbgc-2d-pco2-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-paco2-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "paco2", "paco2", "oceanbgc-2d-paco2-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-pprod_gross_2d-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "pprod_gross_2d", "pprod_gross_2d", "oceanbgc-2d-pprod_gross_2d-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-atm_co2-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "atm_co2", "atm_co2", "oceanbgc-2d-atm_co2-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-wnd-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "wnd", "wnd", "oceanbgc-2d-wnd-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-det_sediment-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "det_sediment", "det_sediment", "oceanbgc-2d-det_sediment-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-caco3_sediment-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "caco3_sediment", "caco3_sediment", "oceanbgc-2d-caco3_sediment-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-surface_no3-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "surface_no3", "surface_no3", "oceanbgc-2d-surface_no3-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-surface_phy-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "surface_phy", "surface_phy", "oceanbgc-2d-surface_phy-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-surface_alk-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "surface_alk", "surface_alk", "oceanbgc-2d-surface_alk-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-surface_dic-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "surface_dic", "surface_dic", "oceanbgc-2d-surface_dic-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-surface_adic-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "surface_adic", "surface_adic", "oceanbgc-2d-surface_adic-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"oceanbgc-2d-surface_o2-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
+"ocean_model", "surface_o2", "surface_o2", "oceanbgc-2d-surface_o2-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# monthly 3d ocean fields
+
+"ocean-3d-temp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "temp", "temp", "ocean-3d-temp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-pot_temp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "pot_temp", "pot_temp", "ocean-3d-pot_temp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-3d-salt-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "salt", "salt", "ocean-3d-salt-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# monthly 2d ocean fields
+
+"ocean-2d-surface_temp-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "surface_temp", "surface_temp", "ocean-2d-surface_temp-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-surface_salt-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "surface_salt", "surface_salt", "ocean-2d-surface_salt-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-mld-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "mld", "mld", "ocean-2d-mld-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-tau_x-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "tau_x", "tau_x", "ocean-2d-tau_x-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-tau_y-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "tau_y", "tau_y", "ocean-2d-tau_y-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-usurf-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "usurf", "usurf", "ocean-2d-usurf-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-vsurf-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "vsurf", "vsurf", "ocean-2d-vsurf-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# monthly 1d ocean fields
+
+"ocean-1d-1monthly-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "geolat_c", "geolat_c", "ocean-1d-1monthly-ym%4yr%2mo", "all", "none", "none", 2
+"ocean_model", "temp_merid_flux_advect_global", "temp_merid_flux_advect_global", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_over_global", "temp_merid_flux_over_global", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_gyre_global", "temp_merid_flux_gyre_global", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_advect_global", "salt_merid_flux_advect_global", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_over_global", "salt_merid_flux_over_global", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_gyre_global", "salt_merid_flux_gyre_global", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_advect_southern", "temp_merid_flux_advect_southern", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_over_southern", "temp_merid_flux_over_southern", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_gyre_southern", "temp_merid_flux_gyre_southern", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_advect_southern", "salt_merid_flux_advect_southern", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_over_southern", "salt_merid_flux_over_southern", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_gyre_southern", "salt_merid_flux_gyre_southern", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_advect_atlantic", "temp_merid_flux_advect_atlantic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_over_atlantic", "temp_merid_flux_over_atlantic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_gyre_atlantic", "temp_merid_flux_gyre_atlantic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_advect_atlantic", "salt_merid_flux_advect_atlantic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_over_atlantic", "salt_merid_flux_over_atlantic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_gyre_atlantic", "salt_merid_flux_gyre_atlantic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_advect_pacific", "temp_merid_flux_advect_pacific", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_over_pacific", "temp_merid_flux_over_pacific", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_gyre_pacific", "temp_merid_flux_gyre_pacific", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_advect_pacific", "salt_merid_flux_advect_pacific", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_over_pacific", "salt_merid_flux_over_pacific", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_gyre_pacific", "salt_merid_flux_gyre_pacific", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_advect_arctic", "temp_merid_flux_advect_arctic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_over_arctic", "temp_merid_flux_over_arctic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_gyre_arctic", "temp_merid_flux_gyre_arctic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_advect_arctic", "salt_merid_flux_advect_arctic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_over_arctic", "salt_merid_flux_over_arctic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_gyre_arctic", "salt_merid_flux_gyre_arctic", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_advect_indian", "temp_merid_flux_advect_indian", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_over_indian", "temp_merid_flux_over_indian", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_merid_flux_gyre_indian", "temp_merid_flux_gyre_indian", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_advect_indian", "salt_merid_flux_advect_indian", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_over_indian", "salt_merid_flux_over_indian", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_merid_flux_gyre_indian", "salt_merid_flux_gyre_indian", "ocean-1d-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# monthly scalar ocean fields
+
+"ocean-scalar-1monthly-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "total_mass_seawater", "total_mass_seawater", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_volume_seawater", "total_volume_seawater", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "eta_global", "eta_global", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "eta_adjust", "eta_adjust", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "pbot_adjust", "pbot_adjust", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_global_ave", "temp_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_global_ave", "salt_global_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_pme_river", "total_ocean_pme_river", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_river", "total_ocean_river", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_evap", "total_ocean_evap", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_pme_sbc", "total_ocean_pme_sbc", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_fprec", "total_ocean_fprec", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_lprec", "total_ocean_lprec", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_runoff", "total_ocean_runoff", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_salt", "total_ocean_salt", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_heat", "total_ocean_heat", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_hflux_pme", "total_ocean_hflux_pme", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_swflx", "total_ocean_swflx", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_swflx_vis", "total_ocean_swflx_vis", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_evap_heat", "total_ocean_evap_heat", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_lw_heat", "total_ocean_lw_heat", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_sens_heat", "total_ocean_sens_heat", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_fprec_melt_heat", "total_ocean_fprec_melt_heat", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_ocean_runoff_heat", "total_ocean_runoff_heat", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "ke_tot", "ke_tot", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "pe_tot", "pe_tot", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "temp_surface_ave", "temp_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "salt_surface_ave", "salt_surface_ave", "ocean-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+
+
+# monthly scalar BGC fields
+
+"oceanbgc-scalar-1monthly-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "total_co2_flux", "total_co2_flux", "oceanbgc-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
+"ocean_model", "total_aco2_flux", "total_aco2_flux", "oceanbgc-scalar-1monthly-ym%4yr%2mo", "all", "average", "none", 2
diff --git a/ocean/diagnostic_profiles/diag_table_standard b/ocean/diagnostic_profiles/diag_table_standard
index a120db4..3f59da8 100644
--- a/ocean/diagnostic_profiles/diag_table_standard
+++ b/ocean/diagnostic_profiles/diag_table_standard
@@ -538,6 +538,18 @@ ACCESS-ESM_CMIP6
 "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "hblt", "hblt", "ocean-2d-hblt-1monthly-max-ym%4yr%2mo", "all", "max", "none", 2
 
+"ocean-2d-temp_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "temp_yflux_adv_int_z", "temp_yflux_adv_int_z", "ocean-2d-temp_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-temp_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "temp_xflux_adv_int_z", "temp_xflux_adv_int_z", "ocean-2d-temp_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-salt_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "salt_yflux_adv_int_z", "salt_yflux_adv_int_z", "ocean-2d-salt_yflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
+"ocean-2d-salt_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
+"ocean_model", "salt_xflux_adv_int_z", "salt_xflux_adv_int_z", "ocean-2d-salt_xflux_adv_int_z-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
+
 
 # monthly 2d BGC fields
 
diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml
index 2713d66..31d982a 100644
--- a/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml
+++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml
@@ -325,6 +325,10 @@ diag_table:
             wind_power_u:
             wind_power_v:
             hblt: {reduction_method: 'max'}
+            temp_yflux_adv_int_z:
+            temp_xflux_adv_int_z:
+            salt_yflux_adv_int_z:
+            salt_xflux_adv_int_z:
 
     'monthly 2d BGC fields':
         defaults:  # these can be overridden for individual fields below
diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_spinup_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_spinup_source.yaml
new file mode 100644
index 0000000..ee9261c
--- /dev/null
+++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_spinup_source.yaml
@@ -0,0 +1,392 @@
+#######################################################################################################
+# This yaml file is used by make_diag_table.py to create a diag_table file specifying MOM5 diagnostics.
+# Latest version: https://github.com/COSIMA/make_diag_table
+#
+# Define the diagnostics you want in the diag_table section below.
+#
+# The MOM diag_table format is defined here:
+# https://github.com/mom-ocean/MOM5/blob/master/src/shared/diag_manager/diag_table.F90
+# https://mom6.readthedocs.io/en/main/api/generated/pages/Diagnostics.html
+#######################################################################################################
+
+
+# Define global default settings which will be applied to all diagnostics,
+# unless overridden in diag_table section below, either in defaults or individual fields.
+# You're unlikely to need to change any of the global_defaults.
+global_defaults:
+# global_section:
+    title: ACCESS-ESM_CMIP6  # any string
+    base_date: [ 0001, 1, 1, 0, 0, 0 ]  # reference time used for the time units. six integers: year, month, day, hour, minute, second
+# file section:
+    file_name:  # String, or list of components, for file name (without trailing ".nc").
+    # If a list, its elements are a mixture of strings and dictionaries.
+    # String list elements are concatenated, each preceded by file_name_separator.
+    # Dictionary list elements must have one key-value pair; the value is a list
+    # containing 1 or more strings to be concatenated, each preceded by the key
+    # (a string) instead of file_name_separator. The key may be an empty string,
+    # which is useful if file_name_date begins with %, since FMS prepends _ .
+    # All filename list string elements (other than field_name) must exist as keys in global_defaults.
+    # If file_name_date is used, it must be the last item.
+    # Key values are looked up, converted to strings and then substituted using file_name_substitutions.
+    # Empty strings (and their preceding separator) are ignored if file_name_omit_empty is true.
+    # A separator is not used prior to the first item.
+        - file_name_prefix
+        - file_name_dimension
+        - field_name  # substituted by field name in diag_table section below
+        - output_freq
+        - '':
+            - output_freq_units
+        - reduction_method
+        - file_name_date
+    output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+    output_freq_units: months  # time units for output: years, months, days, hours, minutes, or seconds
+    file_format: 1  # integer, must be 1, specifying NetCDF (the only format currently supported)
+    time_axis_units: days  # time units for the output file time axis: years, months, days, hours, minutes, or seconds
+    time_axis_name: time  # must be "time" (case-insensitive)
+    new_file_freq: 1  # optional integer: frequency (in new_file_freq_units) for closing the existing file, and creating a new file
+    new_file_freq_units: years  # time units for new_file_freq: years, months, days, hours, minutes, or seconds (optional; required if and only if new_file_freq specified)
+    start_time:  # Time to start the file for the first time. The format of this string is the same as base_date (optional; requires new_file_freq, new_file_freq_units)
+    file_duration:  # integer: How long file should receive data after start time (optional; requires new_file_freq, new_file_freq_units, start_time)
+    file_duration_units:  # units for file_duration: years, months, days, hours, minutes, or seconds (optional; required if and only if file_duration specified)
+# field section:
+    module_name: ocean_model
+    field_name:  # set via keys in the fields section of the diag_table section below
+    output_name:  # same as field_name unless overridden
+    # file_name:  # same as file_name in file section above unless overridden in diag_table section below
+    time_sampling: all  # Currently not used.  Please use the string "all".
+    reduction_method: mean  # mean, snap, rms, pow##, min, max, or diurnal##
+    # reduction_method options:
+    #     mean or average or true: Average from the last time written to the current time. Becomes "average" in diag_table.
+    #     snap or none or false: No reduction.  Write snapshot of current time step value only. Becomes "none" in diag_table.
+    #     rms: Calculate the root mean square from the last time written to the current time.
+    #     pow##: Calculate the mean of the power ## from the last time written to the current time.
+    #     min: Minimum value from last write to current time.
+    #     max: Maximum value from last write to current time.
+    #     diurnal##: ## diurnal averages
+    regional_section: none  # string: bounds of the regional section to capture ("none" indicates a global region). String format: lat_min, lat_max, lon_min, lon_max, vert_min, vert_max. Use vert_min = -1 and vert_max = -1 to get the entire vertical axis.
+    packing: 2
+    # packing is the Fortran number KIND of the data written:
+    #     1: double precision
+    #     2: float (single precision)
+    #     4: packed 16-bit integers
+    #     8: packed 1-byte (not tested)
+# extra things for constructing filename:
+    file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
+    file_name_prefix: ocean
+    file_name_date: "ym%4yr%2mo"  # run date/time of file opening; format: %, 1 digit (#digits), one of (yr, mo, dy, hr, mi, sc); date/time components will be separated by _ in filename.
+    file_name_separator: "-"  # used to separate filename components; best not to use "_" to avoid confusion with fields and dates
+    file_name_omit_empty: true  # whether to omit empty filename components to avoid duplicate file_name_separator
+    file_name_substitutions:  # string replacements for filename components
+        years: yearly
+        months: monthly
+        days: daily
+        hours: hourly
+        none: snap  # careful! will apply to both reduction_method and regional_section
+        'False': snap
+        average: mean
+        'True': mean
+        None: ""  # for empty items
+
+
+#######################################################################################################
+# diag_table section - this defines the diagnostics that will appear in diag_table.
+# 
+# Top-level categories in diag_table have arbitrary names (they're just used for
+# comments in the output diag_table). Make as many of these as you like to group
+# similar diagnostics with shared defaults. Note that each of the top-level
+# categories can have only have one instance of each field name, so if you need
+# multiple outputs of the same field (e.g. as both averages and snapshots), you’ll
+# need to make additional categories.
+# 
+# Within each top-level category there's an optional defaults section and a
+# fields section. The defaults section overrides items in global_defaults for
+# all fields in the category. The field section specifies diagnostic field
+# names. To add a new diagnostic, all you need to do is add its name to the
+# field section in the appropriate category. Each field name can be followed by
+# a dictionary overriding the category and global defaults for that field only.
+# 
+# Some of the available diagnostics are listed here:
+# https://raw.githubusercontent.com/COSIMA/access-om2/master/MOM_diags.txt
+# https://github.com/COSIMA/access-om2/wiki/Technical-documentation#MOM5-diagnostics-list
+diag_table:
+    'static 2d grid data':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: 2d  # descriptor for filename, e.g. 3d, 2d, scalar
+            file_name:  # String, or list of components, for file name (without trailing ".nc").
+            # If a list, its elements are a mixture of strings and dictionaries.
+            # String list elements are concatenated, each preceded by file_name_separator.
+            # Dictionary list elements must have one key-value pair; the value is a list
+            # containing 1 or more strings to be concatenated, each preceded by the key
+            # (a string) instead of file_name_separator. The key may be an empty string,
+            # which is useful if file_name_date begins with %, since FMS prepends _ .
+            # All filename list string elements (other than field_name) must exist as keys in global_defaults.
+            # If file_name_date is used, it must be the last item.
+            # Key values are looked up, converted to strings and then substituted using file_name_substitutions.
+            # Empty strings (and their preceding separator) are ignored if file_name_omit_empty is true.
+            # A separator is not used prior to the first item.
+                - file_name_prefix
+                - file_name_dimension
+                - field_name  # substituted by field name in fields section below
+            reduction_method: snap  # mean, snap, rms, pow##, min, max, or diurnal##
+            output_freq: -1  # Output frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            new_file_freq:  # optional integer: frequency (in new_file_freq_units) for closing the existing file, and creating a new file
+        fields:
+            area_t:
+            area_u:
+            geolat_c:
+            geolat_t:
+            geolon_c:
+            geolon_t:
+            ht:
+            hu:
+            kmt:
+            kmu:
+            pbot0:
+            tide_speed_wave:
+            roughness_length:
+            roughness_amp:
+            visc_crit_bih:
+            tide_speed_drag:
+            tide_speed_mask:
+
+    'yearly 3d ocean fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: years  # time units for output: years, months, days, hours, minutes, or seconds
+        fields:
+            tx_trans_rho:
+            tx_trans_rho_gm: 
+            tx_trans_gm:
+            tx_trans:
+            tz_trans:
+            tx_trans_submeso:
+            ty_trans_submeso:
+            neutral_rho:
+            age_global:
+            rho:
+            ty_trans:
+            ty_trans_gm:
+            ty_trans_rho:
+            ty_trans_rho_gm:
+            temp_vdiffuse_impl:
+            salt_vdiffuse_impl:
+            u:
+            v:
+            dzt:
+
+    'yearly 3d BGC fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_prefix: oceanbgc
+            file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: years  # time units for output: years, months, days, hours, minutes, or seconds
+        fields:
+            no3:
+            phy:
+            o2:
+            det:
+            zoo:
+            caco3:
+            dic:
+            alk:
+            adic:
+            fe:
+            pprod_gross:
+
+    'yearly 2d ocean fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: 2d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: years  # time units for output: years, months, days, hours, minutes, or seconds
+        fields:
+            sea_level:
+            lprec:
+            fprec:
+            evap:
+            runoff:
+            lw_heat:
+            evap_heat:
+            sens_heat:
+            swflx:
+            pme:
+            pme_sbc:
+            river:
+            sfc_hflux_pme:
+            eta_t:
+            bottom_temp:
+            bottom_salt:
+            bottom_age_global:
+            psiu:
+            ekman_we:
+            psiv:
+            tau_curl:
+            eta_u:
+            urhod:
+            vrhod:
+            ubott:
+            vbott:
+            temp_yflux_adv_int_z:
+            temp_xflux_adv_int_z:
+            salt_yflux_adv_int_z:
+            salt_xflux_adv_int_z:
+
+    'yearly 2d BGC fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_prefix: oceanbgc
+            file_name_dimension: 2d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: years  # time units for output: years, months, days, hours, minutes, or seconds
+        fields:
+            stf03:
+            stf07:
+            stf09:
+            stf10:
+            pco2:
+            paco2:
+            pprod_gross_2d:
+            atm_co2:
+            wnd:
+            det_sediment:
+            caco3_sediment:
+            surface_no3:
+            surface_phy:
+            surface_alk:
+            surface_dic:
+            surface_adic:
+            surface_o2:
+
+    'monthly 3d ocean fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: months  # time units for output: years, months, days, hours, minutes, or seconds
+        fields:
+            temp:
+            pot_temp:
+            salt:
+
+    'monthly 2d ocean fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: 2d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: months  # time units for output: years, months, days, hours, minutes, or seconds
+        fields:
+            surface_temp:
+            surface_salt:
+            mld:
+            tau_x:
+            tau_y:
+            usurf:
+            vsurf:
+
+    'monthly 1d ocean fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: 1d  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: months  # time units for output: years, months, days, hours, minutes, or seconds
+            file_name:
+                - file_name_prefix
+                - file_name_dimension
+                - output_freq
+                - '':
+                    - output_freq_units
+                - file_name_date
+        fields:
+            geolat_c: {reduction_method: 'snap'} # See https://github.com/ACCESS-NRI/access-esm1.5-configs/issues/74
+            temp_merid_flux_advect_global:
+            temp_merid_flux_over_global:
+            temp_merid_flux_gyre_global:
+            salt_merid_flux_advect_global:
+            salt_merid_flux_over_global:
+            salt_merid_flux_gyre_global:
+            temp_merid_flux_advect_southern:
+            temp_merid_flux_over_southern:
+            temp_merid_flux_gyre_southern:
+            salt_merid_flux_advect_southern:
+            salt_merid_flux_over_southern:
+            salt_merid_flux_gyre_southern:
+            temp_merid_flux_advect_atlantic:
+            temp_merid_flux_over_atlantic:
+            temp_merid_flux_gyre_atlantic:
+            salt_merid_flux_advect_atlantic:
+            salt_merid_flux_over_atlantic:
+            salt_merid_flux_gyre_atlantic:
+            temp_merid_flux_advect_pacific:
+            temp_merid_flux_over_pacific:
+            temp_merid_flux_gyre_pacific:
+            salt_merid_flux_advect_pacific:
+            salt_merid_flux_over_pacific:
+            salt_merid_flux_gyre_pacific:
+            temp_merid_flux_advect_arctic:
+            temp_merid_flux_over_arctic:
+            temp_merid_flux_gyre_arctic:
+            salt_merid_flux_advect_arctic:
+            salt_merid_flux_over_arctic:
+            salt_merid_flux_gyre_arctic:
+            temp_merid_flux_advect_indian:
+            temp_merid_flux_over_indian:
+            temp_merid_flux_gyre_indian:
+            salt_merid_flux_advect_indian:
+            salt_merid_flux_over_indian:
+            salt_merid_flux_gyre_indian:
+            
+    'monthly scalar ocean fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_dimension: scalar  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: months  # time units for output: years, months, days, hours, minutes, or seconds
+            file_name:
+                - file_name_prefix
+                - file_name_dimension
+                - output_freq
+                - '':
+                    - output_freq_units
+                - file_name_date
+        fields:
+            total_mass_seawater:
+            total_volume_seawater:
+            eta_global:
+            eta_adjust:
+            pbot_adjust:
+            temp_global_ave:
+            salt_global_ave:
+            total_ocean_pme_river:
+            total_ocean_river:
+            total_ocean_evap:
+            total_ocean_pme_sbc:
+            total_ocean_fprec:
+            total_ocean_lprec:
+            total_ocean_runoff:
+            total_ocean_salt:
+            total_ocean_heat:
+            total_ocean_hflux_pme:
+            total_ocean_swflx:
+            total_ocean_swflx_vis:
+            total_ocean_evap_heat:
+            total_ocean_lw_heat:
+            total_ocean_sens_heat:
+            total_ocean_fprec_melt_heat:
+            total_ocean_runoff_heat:
+            ke_tot:
+            pe_tot:
+            temp_surface_ave:
+            salt_surface_ave:
+
+    'monthly scalar BGC fields':
+        defaults:  # these can be overridden for individual fields below
+            file_name_prefix: oceanbgc
+            file_name_dimension: scalar  # descriptor for filename, e.g. 3d, 2d, scalar
+            output_freq: 1  # integer: output sampling frequency in output_freq_units (0: every timestep; -1: only at end of run)
+            output_freq_units: months  # time units for output: years, months, days, hours, minutes, or seconds
+            file_name:
+                - file_name_prefix
+                - file_name_dimension
+                - output_freq
+                - '':
+                    - output_freq_units
+                - file_name_date
+        fields:
+            total_co2_flux:
+            total_aco2_flux:
+
diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml
index e587c35..8855beb 100644
--- a/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml
+++ b/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml
@@ -332,6 +332,10 @@ diag_table:
             wind_power_u:
             wind_power_v:
             hblt: {reduction_method: 'max'}
+            temp_yflux_adv_int_z:
+            temp_xflux_adv_int_z:
+            salt_yflux_adv_int_z:
+            salt_xflux_adv_int_z:
 
     'monthly 2d BGC fields':
         defaults:  # these can be overridden for individual fields below