diff --git a/bld/namelist_files/use_cases/1950-2010_ccmi_refc1_waccmx_ma.xml b/bld/namelist_files/use_cases/1950-2010_ccmi_refc1_waccmx_ma.xml index 52349f423b..8d974258c2 100644 --- a/bld/namelist_files/use_cases/1950-2010_ccmi_refc1_waccmx_ma.xml +++ b/bld/namelist_files/use_cases/1950-2010_ccmi_refc1_waccmx_ma.xml @@ -71,9 +71,9 @@ - 'A', 'I', 'I', 'A', 'A', 'A' - 0, -1, -24, -24, -120, -24 - 1, 24, 7, 7, 10, 365 + 'A', 'I', 'I', 'A', 'A', 'A', 'I' + 0, -1, -24, -24, -120, -24, -120 + 1, 24, 7, 7, 10, 365, 73 @@ -95,7 +95,7 @@ 'QRL_TOT', 'PSL', 'HNO3_STS', 'HNO3_NAT', 'HNO3_GAS', 'NO_Aircraft', 'NO_Lightning', 'QRS_AUR', 'QRS_CO2NIR', 'QRS_EUV', 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'TREFHT', 'VERT', 'VTGWORO', 'VTGWSPEC', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', - 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', + 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH', 'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens' @@ -127,9 +127,11 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'OMEGA_08_COS', 'OMEGA_08_SIN' - + 'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS' - + + +'FRONTGF' 42 diff --git a/bld/namelist_files/use_cases/held_suarez_1994.xml b/bld/namelist_files/use_cases/held_suarez_1994.xml index 4f6ffe13a8..274e511fca 100644 --- a/bld/namelist_files/use_cases/held_suarez_1994.xml +++ b/bld/namelist_files/use_cases/held_suarez_1994.xml @@ -20,7 +20,8 @@ 0,-6 - 'U:I','V:I','T:I' + 'U','V','T' +'A','I' diff --git a/bld/namelist_files/use_cases/hist_trop_strat_nudged_cam6.xml b/bld/namelist_files/use_cases/hist_trop_strat_nudged_cam6.xml index 0152cba659..832f815854 100644 --- a/bld/namelist_files/use_cases/hist_trop_strat_nudged_cam6.xml +++ b/bld/namelist_files/use_cases/hist_trop_strat_nudged_cam6.xml @@ -183,9 +183,9 @@ - 1, 30 - 0, -24 -'A', 'A' + 1, 30, 30 + 0, -24, -24 +'A', 'A', 'I' 1, 1 0, 0 @@ -236,7 +236,7 @@ - 'PMID', 'PDELDRY','PS','PHIS:I','Z3','T','U','V','Q','TROP_P', 'CLOUD', + 'PMID', 'PDELDRY','PS','PHIS','Z3','T','U','V','Q','TROP_P', 'CLOUD', 'CO','O3','O3S','NO2','NO','OH','ISOP','SO2', 'PAN', 'HNO3', 'C2H6', 'C3H8', 'CH2O', 'CH3COCH3', 'SFISOP','SFCO','SFNO','SFNO2', 'PM25_SRF', 'so4_a1','so4_a2','so4_a3','dst_a1','dst_a2','dst_a3','soa_a1','soa_a2', @@ -284,5 +284,7 @@ 'WD_TERPACID2','WD_TERPACID3','WD_TERPA3PAN','WD_TERPOOHL','WD_TERPA3', 'WD_APIN','WD_BPIN','WD_LIMON','WD_MYRC' + +'PHIS' diff --git a/bld/namelist_files/use_cases/sd_waccm_ma_cam4.xml b/bld/namelist_files/use_cases/sd_waccm_ma_cam4.xml index 6fa2495972..399317c2ce 100644 --- a/bld/namelist_files/use_cases/sd_waccm_ma_cam4.xml +++ b/bld/namelist_files/use_cases/sd_waccm_ma_cam4.xml @@ -86,8 +86,8 @@ - 1, 30, 120, 240, 240, 480, 365, 73, 30 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 30, 120, 240, 240, 480, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' @@ -104,7 +104,7 @@ 'DTCORE', 'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', - 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', + 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'TROP_P', 'TROP_T', 'TROP_Z', 'SAD_AERO', 'REFF_AERO', 'MASS', @@ -119,9 +119,10 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' .true. diff --git a/bld/namelist_files/use_cases/sd_waccm_ma_cam6.xml b/bld/namelist_files/use_cases/sd_waccm_ma_cam6.xml index 8adf1f6333..027faf2f11 100644 --- a/bld/namelist_files/use_cases/sd_waccm_ma_cam6.xml +++ b/bld/namelist_files/use_cases/sd_waccm_ma_cam6.xml @@ -66,8 +66,8 @@ - 1, 30, 120, 240, 240, 480, 365, 73, 30 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 30, 120, 240, 240, 480, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' @@ -83,7 +83,7 @@ 'DTCORE', 'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', - 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', + 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'NITROP_PD', 'TROP_P', 'TROP_T', 'TROP_Z', 'SAD_AERO', 'REFF_AERO', @@ -101,10 +101,11 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' .true. .true. diff --git a/bld/namelist_files/use_cases/sd_waccm_sulfur.xml b/bld/namelist_files/use_cases/sd_waccm_sulfur.xml index 25c4d622de..efde344e50 100644 --- a/bld/namelist_files/use_cases/sd_waccm_sulfur.xml +++ b/bld/namelist_files/use_cases/sd_waccm_sulfur.xml @@ -61,9 +61,9 @@ -1,10,20,73,365 -0,-240,-240,-24,-24 -'A','I','I','A','A' +1,10,20,73,365,10 +0,-240,-240,-24,-24,-120 +'A','I','B','A','A','I' @@ -85,7 +85,7 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', 'PS_12_SIN', 'CLDLIQ','CLDICE','CONCLD', - 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', + 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', 'TAUGWX', 'TAUGWY', 'TAUX','TAUY','SNOWHLND','SNOWHICE','ICEFRAC','FSDSC','SFNO', 'SFCO', 'SFCH2O','CFC11STAR' @@ -108,7 +108,7 @@ 'VTHzm', 'WTHzm', 'UVzm', 'UWzm', 'TH', 'MSKtem' - + 'PS:B', 'T:B', 'Z3:B', 'U:B', 'V:B', 'CO:B', 'CO2:B', 'H2:B', 'O:B', 'O2:B', 'O3:B', 'H:B', 'OH:B', 'HO2:B', 'H2O:B', @@ -118,12 +118,13 @@ 'BRO:B', 'NO3:B', 'DTCORE:B', 'DTV:B', 'TTGW:B','OMEGA:B' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS','FRONTGF:I', 'OMEGA' + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS','OMEGA' 'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS' +'FRONTGF' 50. 60. diff --git a/bld/namelist_files/use_cases/sd_waccm_tsmlt_cam6.xml b/bld/namelist_files/use_cases/sd_waccm_tsmlt_cam6.xml index a95e41e322..41dba606d7 100644 --- a/bld/namelist_files/use_cases/sd_waccm_tsmlt_cam6.xml +++ b/bld/namelist_files/use_cases/sd_waccm_tsmlt_cam6.xml @@ -51,9 +51,9 @@ - 1, 5, 20, 40, 120, 240, 365, 73, 365 - 0, -24, -6, -3, -1, 1, -24,-120,-240 -'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' + 1, 5, 20, 40, 120, 240, 365, 73, 365, 20 + 0, -24, -6, -3, -1, 1, -24,-120,-240,-120 +'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I', 'I' .true. .false. @@ -163,8 +163,9 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'NITROP_PD', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'NITROP_PD', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' diff --git a/bld/namelist_files/use_cases/sd_waccmx_ma_cam4.xml b/bld/namelist_files/use_cases/sd_waccmx_ma_cam4.xml index 56b964bc54..d2f9d05ff7 100644 --- a/bld/namelist_files/use_cases/sd_waccmx_ma_cam4.xml +++ b/bld/namelist_files/use_cases/sd_waccmx_ma_cam4.xml @@ -95,7 +95,7 @@ 'QRL_TOT', 'PSL', 'HNO3_STS', 'HNO3_NAT', 'HNO3_GAS', 'NO_Aircraft', 'NO_Lightning', 'QRS_AUR', 'QRS_CO2NIR', 'QRS_EUV', 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'TREFHT', 'VERT', 'VTGWORO', 'VTGWSPEC', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', - 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', + 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH', 'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens' @@ -110,7 +110,7 @@ 'Z3', 'T', 'TIon', 'TElec', 'e', 'U', 'V', 'OMEGA', 'UI', 'VI', 'WI', 'ElecColDens', 'PHIM2D', 'PS', 'PED_CONDUCTANCE', 'HALL_CONDUCTANCE', 'ED1', 'ED2', 'O', 'O2', 'H', 'NO', 'CO2', 'N', 'O1D', 'Op2P', 'Op2D', 'Op', 'Np', 'N2p', 'O2p', 'NOp', 'QJOULE', 'SIGMAHAL', 'SIGMAPED', 'SolIonRate_Tot', - 'Z3GM', 'OpDens', 'EDens' + 'Z3GM', 'OpDens', 'EDens', 'FRONTGF' diff --git a/bld/namelist_files/use_cases/sd_waccmx_ma_cam6.xml b/bld/namelist_files/use_cases/sd_waccmx_ma_cam6.xml index 6b56c46b17..1d8c14a579 100644 --- a/bld/namelist_files/use_cases/sd_waccmx_ma_cam6.xml +++ b/bld/namelist_files/use_cases/sd_waccmx_ma_cam6.xml @@ -59,8 +59,8 @@ 'A', 'I', 'I', 'A', 'A', 'A', 'A', 'I' - 0, -1, -24, -24, -120, -24, -120, -240 - 1, 24, 7, 7, 10, 365, 73, 30 + 0, -1, -24, -24, -120, -24, -120, -120 + 1, 24, 7, 7, 10, 365, 73, 73 @@ -82,7 +82,7 @@ 'QRL_TOT', 'PSL', 'HNO3_STS', 'HNO3_NAT', 'HNO3_GAS', 'NO_Aircraft', 'NO_Lightning', 'QRS_AUR', 'QRS_CO2NIR', 'QRS_EUV', 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'TREFHT', 'VERT', 'VTGWORO', 'VTGWSPEC', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', - 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', + 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH', 'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens' @@ -114,15 +114,17 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'OMEGA_08_COS', 'OMEGA_08_SIN' - + 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - + - - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' - + + +'FRONTGF' .true. .true. diff --git a/bld/namelist_files/use_cases/waccm_carma_bc_2013_cam4.xml b/bld/namelist_files/use_cases/waccm_carma_bc_2013_cam4.xml index a6e5287553..98c8700c52 100644 --- a/bld/namelist_files/use_cases/waccm_carma_bc_2013_cam4.xml +++ b/bld/namelist_files/use_cases/waccm_carma_bc_2013_cam4.xml @@ -71,9 +71,9 @@ - 1, 10, 20, 7, 365 - 0, -240, -240, -24, -24 - 'A', 'I', 'I', 'A', 'A' + 1, 10, 20, 7, 365, 10 + 0, -240, -240, -24, -24, -120 + 'A', 'I', 'B', 'A', 'A', 'I' @@ -95,7 +95,7 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', 'PS_12_SIN', 'CLDLIQ','CLDICE','CONCLD', - 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', + 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', 'TAUGWX', 'TAUGWY', 'TAUX','TAUY','SNOWHLND','SNOWHICE','ICEFRAC','FSDSC','SFNO', 'SFCO', 'SFCH2O','CFC11STAR','TROPP_FD' @@ -118,7 +118,7 @@ 'VTHzm', 'WTHzm', 'UVzm', 'UWzm', 'TH', 'MSKtem' - + 'PS:B', 'T:B', 'Z3:B', 'U:B', 'V:B', 'CO:B', 'CO2:B', 'H2:B', 'O:B', 'O2:B', 'O3:B', 'H:B', 'OH:B', 'HO2:B', 'H2O:B', @@ -128,12 +128,13 @@ 'BRO:B', 'NO3:B', 'DTCORE:B', 'DTV:B', 'TTGW:B','OMEGA:B' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS','FRONTGF:I', 'OMEGA' + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA' 'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS' +'FRONTGF' 1850-2000 diff --git a/bld/namelist_files/use_cases/waccm_ma_1850_cam6.xml b/bld/namelist_files/use_cases/waccm_ma_1850_cam6.xml index 99eb24d6b8..283f43afe6 100644 --- a/bld/namelist_files/use_cases/waccm_ma_1850_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_ma_1850_cam6.xml @@ -50,8 +50,8 @@ - 1, 30, 120, 240, 240, 480, 365, 73, 30 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 30, 120, 240, 240, 480, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' @@ -67,7 +67,7 @@ 'DTCORE', 'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', - 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', + 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'NITROP_PD', 'TROP_P', 'TROP_T', 'TROP_Z', 'SAD_AERO', 'REFF_AERO', @@ -86,10 +86,11 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' .true. .true. diff --git a/bld/namelist_files/use_cases/waccm_ma_2000_cam6.xml b/bld/namelist_files/use_cases/waccm_ma_2000_cam6.xml index cf84af173e..30c6d8d2fc 100644 --- a/bld/namelist_files/use_cases/waccm_ma_2000_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_ma_2000_cam6.xml @@ -146,8 +146,8 @@ - 1, 30, 120, 240, 240, 480, 365, 73, 30 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 30, 120, 240, 240, 480, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' @@ -163,7 +163,7 @@ 'DTCORE', 'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', - 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', + 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'NITROP_PD', 'TROP_P', 'TROP_T', 'TROP_Z', 'SAD_AERO', 'REFF_AERO', @@ -182,10 +182,11 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' .true. .true. diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam4.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam4.xml index 1177ebd155..bf7dadecd0 100644 --- a/bld/namelist_files/use_cases/waccm_ma_hist_cam4.xml +++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam4.xml @@ -73,8 +73,8 @@ - 1, 30, 120, 240, 240, 480, 365, 73, 30 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 30, 120, 240, 240, 480, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' @@ -90,7 +90,7 @@ 'DTCORE', 'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', - 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', + 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'TROP_P', 'TROP_T', 'TROP_Z', 'SAD_AERO', 'REFF_AERO', 'MASS', @@ -105,9 +105,10 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' .true. .true. diff --git a/bld/namelist_files/use_cases/waccm_ma_hist_cam6.xml b/bld/namelist_files/use_cases/waccm_ma_hist_cam6.xml index 03c45f097a..16fd9cff2b 100644 --- a/bld/namelist_files/use_cases/waccm_ma_hist_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_ma_hist_cam6.xml @@ -44,8 +44,8 @@ - 1, 30, 120, 240, 240, 480, 365, 73, 30 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 30, 120, 240, 240, 480, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' @@ -61,7 +61,7 @@ 'DTCORE', 'T_24_COS', 'T_24_SIN', 'T_12_COS', 'T_12_SIN', 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', - 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', + 'PS_12_SIN', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'NITROP_PD', 'TROP_P', 'TROP_T', 'TROP_Z', 'SAD_AERO', 'REFF_AERO', @@ -80,10 +80,11 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' .true. .true. diff --git a/bld/namelist_files/use_cases/waccm_sc_2000_cam4.xml b/bld/namelist_files/use_cases/waccm_sc_2000_cam4.xml index 3edfca3076..d6281a60f5 100644 --- a/bld/namelist_files/use_cases/waccm_sc_2000_cam4.xml +++ b/bld/namelist_files/use_cases/waccm_sc_2000_cam4.xml @@ -47,9 +47,9 @@ - 1, 10, 20, 73, 365 - 0, -240, -240, -24, -24 - 'A', 'I', 'I', 'A', 'A' + 1, 10, 20, 73, 365, 73 + 0, -240, -240, -24, -24, -120 + 'A', 'I', 'B', 'A', 'A', 'I' @@ -68,7 +68,7 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', 'PS_12_SIN', 'CLDLIQ','CLDICE','CONCLD', - 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', + 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', 'TAUGWX', 'TAUGWY', 'TAUX','TAUY','SNOWHLND','SNOWHICE','ICEFRAC','FSDSC', 'WFRC_O','WFRC_O2','WFRC_O3','WFRC_NO','WFRC_H','WFRC_CO2','WFRC_QRS_TOT' @@ -82,13 +82,15 @@ - 'PS:B', 'T:B', 'Z3:B', 'U:B', 'V:B', - 'QRL_TOT:B', 'QRS_TOT:B', 'DTCORE:B', 'DTV:B', 'TTGW:B','OMEGA:B' + 'PS', 'T', 'Z3', 'U', 'V', + 'QRL_TOT', 'QRS_TOT', 'DTCORE', 'DTV', 'TTGW','OMEGA' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS','FRONTGF:I', 'OMEGA' + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA' + +'FRONTGF' 2000 diff --git a/bld/namelist_files/use_cases/waccm_tsmlt_1850_cam6.xml b/bld/namelist_files/use_cases/waccm_tsmlt_1850_cam6.xml index dec7c58de1..88bfdf566d 100644 --- a/bld/namelist_files/use_cases/waccm_tsmlt_1850_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_tsmlt_1850_cam6.xml @@ -49,8 +49,8 @@ - 1, 5, 20, 40, 120, 240, 365, 73, 365 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 5, 20, 40, 120, 240, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' .true. @@ -113,9 +113,10 @@ - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'NITROP_PD', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'NITROP_PD', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' 1850 diff --git a/bld/namelist_files/use_cases/waccm_tsmlt_2000_cam6.xml b/bld/namelist_files/use_cases/waccm_tsmlt_2000_cam6.xml index b15bcd8b8d..0b81e6ef69 100644 --- a/bld/namelist_files/use_cases/waccm_tsmlt_2000_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_tsmlt_2000_cam6.xml @@ -246,8 +246,8 @@ - 1, 5, 20, 40, 120, 240, 365, 73, 365 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 5, 20, 40, 120, 240, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' .true. @@ -309,8 +309,9 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' diff --git a/bld/namelist_files/use_cases/waccm_tsmlt_2010_cam6.xml b/bld/namelist_files/use_cases/waccm_tsmlt_2010_cam6.xml index 82bc53d3c7..220462e9d4 100644 --- a/bld/namelist_files/use_cases/waccm_tsmlt_2010_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_tsmlt_2010_cam6.xml @@ -146,8 +146,8 @@ - 1, 5, 20, 40, 120, 240, 365, 73, 365 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 5, 20, 40, 120, 240, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' .true. @@ -209,8 +209,9 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' diff --git a/bld/namelist_files/use_cases/waccm_tsmlt_hist_cam6.xml b/bld/namelist_files/use_cases/waccm_tsmlt_hist_cam6.xml index b12c32010a..512c71c4b6 100644 --- a/bld/namelist_files/use_cases/waccm_tsmlt_hist_cam6.xml +++ b/bld/namelist_files/use_cases/waccm_tsmlt_hist_cam6.xml @@ -42,8 +42,8 @@ - 1, 5, 20, 40, 120, 240, 365, 73, 365 - 0, -24, -6, -3, -1, 1, -24,-120,-240 + 1, 5, 20, 40, 120, 240, 365, 73, 73 + 0, -24, -6, -3, -1, 1, -24,-120,-120 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'I' .true. @@ -105,8 +105,9 @@ 'MSKtem','PS','PSL','VTHzm','UVzm','UWzm','Uzm','Vzm','THzm','Wzm','PHIS' - 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'FRONTGF:I', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', + 'PS', 'PSL', 'U', 'V', 'T', 'Z3', 'PHIS', 'OMEGA', 'O3', 'REFF_AERO', 'SAD_AERO', 'so4_a1', 'so4_a2', 'so4_a3', 'AODVISstdn', 'NITROP_PD', 'dgnumwet1', 'dgnumwet2', 'dgnumwet3', 'QRS_TOT', 'CO2', 'H', 'NO', 'O' +'FRONTGF' diff --git a/bld/namelist_files/use_cases/waccmx_ma_2000_cam4.xml b/bld/namelist_files/use_cases/waccmx_ma_2000_cam4.xml index 5658d9cb1d..d3a8c90559 100644 --- a/bld/namelist_files/use_cases/waccmx_ma_2000_cam4.xml +++ b/bld/namelist_files/use_cases/waccmx_ma_2000_cam4.xml @@ -68,9 +68,9 @@ - 1, 8, 1 - 0, -3, -24 - 'A', 'I', 'I' + 1, 8, 1, 73 + 0, -3, -24, -120 + 'A', 'I', 'I', 'I' @@ -92,7 +92,7 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'U_24_COS', 'U_24_SIN', 'U_12_COS', 'U_12_SIN', 'V_24_COS', 'V_24_SIN', 'V_12_COS', 'V_12_SIN', 'PS_24_COS', 'PS_24_SIN', 'PS_12_COS', 'PS_12_SIN', 'CLDLIQ','CLDICE','CONCLD', - 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', + 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS','TAUE','TAUW','TAUN','TAUS', 'TAUGWX', 'TAUGWY', 'TAUX','TAUY','SNOWHLND','SNOWHICE','ICEFRAC','FSDSC','SFNO', 'SFCO', 'SFCH2O','CFC11STAR','TROPP_FD', 'Op', 'O2p', 'Np', 'NOp', 'N2p', 'e' @@ -136,11 +136,13 @@ 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'T', 'TREFHT', 'TTGW', 'U', 'UTGWORO', 'UTGWSPEC', 'V', 'VERT', 'VTGWORO', 'VTGWSPEC', 'Z3', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', 'TCLY', 'TOTH', 'QJOULE', 'UIONTEND', 'VIONTEND', - 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', + 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BUTGWSPEC', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'Op', 'O2p', 'Np', 'NOp', 'N2p', 'e', 'UI', 'VI', 'WI' + +'FRONTGF' 2000 diff --git a/bld/namelist_files/use_cases/waccmx_ma_2000_cam6.xml b/bld/namelist_files/use_cases/waccmx_ma_2000_cam6.xml index 7052ac83bb..612f3e21bf 100644 --- a/bld/namelist_files/use_cases/waccmx_ma_2000_cam6.xml +++ b/bld/namelist_files/use_cases/waccmx_ma_2000_cam6.xml @@ -34,13 +34,13 @@ 2000 -'A', 'I', 'I', 'A', 'A', 'A', 'A' +'A', 'I', 'I', 'A', 'A', 'A', 'A', 'I' -0, -3, -24, -24, -120, -24, -24 -1, 8, 1, 1, 2, 1, 365 +0, -3, -24, -24, -120, -24, -24, -120 +1, 8, 1, 1, 2, 1, 365, 73 -0, -1, -24, -24, -120, -24, -24 -1, 24, 7, 7, 10, 1, 365 +0, -1, -24, -24, -120, -24, -24, -120 +1, 24, 7, 7, 10, 1, 365, 73 @@ -63,7 +63,7 @@ 'SOLIN', 'SWCF', 'QCP', 'QTHERMAL', 'QRL_TOT', 'PSL', 'HNO3_STS', 'HNO3_NAT', 'HNO3_GAS', 'NO_Aircraft', 'NO_Lightning', 'QRS_AUR', 'QRS_CO2NIR', 'QRS_EUV', 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'TREFHT', 'VERT', 'VTGWORO', 'VTGWSPEC', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', 'TCLY', - 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BTAUE', 'BTAUW', + 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH', 'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens' @@ -98,6 +98,8 @@ 'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS' + +'FRONTGF' 42 diff --git a/bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml b/bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml index c928b43f28..48cad55198 100644 --- a/bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml +++ b/bld/namelist_files/use_cases/waccmx_ma_hist_cam6.xml @@ -32,10 +32,10 @@ INTERP_MISSING_MONTHS -'A', 'I', 'I', 'A', 'A', 'A', 'A' +'A', 'I', 'I', 'A', 'A', 'A', 'A', 'I' -0, -3, -24, -24, -120, -24, -24 -1, 8, 1, 1, 2, 1, 365 +0, -3, -24, -24, -120, -24, -24, -120 +1, 8, 1, 1, 2, 1, 365, 10 0, -1, -24, -24, -120, -24, -24 1, 24, 7, 7, 10, 1, 365 @@ -61,7 +61,7 @@ 'SOLIN', 'SWCF', 'QCP', 'QTHERMAL', 'QRL_TOT', 'PSL', 'HNO3_STS', 'HNO3_NAT', 'HNO3_GAS', 'NO_Aircraft', 'NO_Lightning', 'QRS_AUR', 'QRS_CO2NIR', 'QRS_EUV', 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'TREFHT', 'VERT', 'VTGWORO', 'VTGWSPEC', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', 'TCLY', - 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', 'BTAUE', 'BTAUW', + 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH', 'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens' @@ -96,6 +96,7 @@ 'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS' +'FRONTGF' 42 diff --git a/bld/namelist_files/use_cases/waccmxie_ma_2000_cam4.xml b/bld/namelist_files/use_cases/waccmxie_ma_2000_cam4.xml index a3f8c937ec..0c23df9a46 100644 --- a/bld/namelist_files/use_cases/waccmxie_ma_2000_cam4.xml +++ b/bld/namelist_files/use_cases/waccmxie_ma_2000_cam4.xml @@ -90,9 +90,9 @@ - 'A', 'I', 'I', 'A', 'A', 'A' - 0, -1, -24, -24, -120, -24 - 1, 24, 7, 7, 10, 365 + 'A', 'I', 'I', 'A', 'A', 'A', 'I' + 0, -1, -24, -24, -120, -24, -120 + 1, 24, 7, 7, 10, 365, 73 @@ -114,7 +114,7 @@ 'QRL_TOT', 'PSL', 'HNO3_STS', 'HNO3_NAT', 'HNO3_GAS', 'NO_Aircraft', 'NO_Lightning', 'QRS_AUR', 'QRS_CO2NIR', 'QRS_EUV', 'SAD_ICE', 'SAD_LNAT', 'SAD_SULFC', 'TREFHT', 'VERT', 'VTGWORO', 'VTGWSPEC', 'O2_1S', 'O2_1D', 'NOX', 'NOY', 'CLOX', 'CLOY', 'BROX', 'BROY', - 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'FRONTGF:I', + 'TCLY', 'TOTH', 'UIONTEND', 'VIONTEND', 'DTCORE', 'CLDLIQ', 'CLDICE', 'CONCLD', 'BTAUE', 'BTAUW', 'BTAUN', 'BTAUS', 'TAUE', 'TAUW', 'TAUN', 'TAUS', 'TAUGWX', 'TAUGWY', 'TAUX', 'TAUY', 'SNOWHLND', 'SNOWHICE', 'ICEFRAC', 'FSDSC', 'SFNO', 'SFCO', 'SFCH2O', 'CFC11STAR', 'TROPP_FD', 'KVH', 'KVM', 'KVT', 'Qbkgndtot', 'Z3GM', 'OpDens', 'EDens' @@ -146,9 +146,11 @@ 'OMEGA_24_COS', 'OMEGA_24_SIN', 'OMEGA_12_COS', 'OMEGA_12_SIN', 'OMEGA_08_COS', 'OMEGA_08_SIN' - + 'MSKtem', 'PS', 'PSL', 'VTHzm', 'UVzm', 'UWzm', 'Uzm', 'Vzm', 'THzm','Wzm', 'PHIS' - + + +'FRONTGF' 42 diff --git a/cime_config/testdefs/testmods_dirs/cam/co2rmp/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/co2rmp/user_nl_cam index 18f6cf7791..660af17e0b 100644 --- a/cime_config/testdefs/testmods_dirs/cam/co2rmp/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/co2rmp/user_nl_cam @@ -3,11 +3,12 @@ ndens=1,1,1,1,1,1 nhtfrq=3,3,3,3,3,3 inithist='ENDOFRUN' fexcl1='UU' -fincl1='T:I','PS:I' -fincl2='T:A','PS:A' +fincl1='T','PS' +fincl2='T','PS' fincl3='T:X','PS:X' fincl4='T:M','PS:M' fincl5='PS','U200' fincl6='PS','TREFHTMX','TREFHTMN' +avgflag_pertape='I','A','A','A','I','I' ramp_co2_start_ymd=20000915 scenario_ghg='RAMP_CO2_ONLY' diff --git a/cime_config/testdefs/testmods_dirs/cam/co2rmp_1850/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/co2rmp_1850/user_nl_cam index 9695e5f414..23fcd607bd 100644 --- a/cime_config/testdefs/testmods_dirs/cam/co2rmp_1850/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/co2rmp_1850/user_nl_cam @@ -3,12 +3,13 @@ ndens=1,1,1,1,1,1 nhtfrq=3,3,3,3,3,3 inithist='ENDOFRUN' fexcl1='UU' -fincl1='T:I','PS:I' -fincl2='T:A','PS:A' +fincl1='T','PS' +fincl2='T','PS' fincl3='T:X','PS:X' fincl4='T:M','PS:M' fincl5='PS','U200' fincl6='PS','TREFHTMX','TREFHTMN' +avgflag_pertape='I','A','A','A','I','I' inithist='DAILY' ramp_co2_start_ymd=20000915 scenario_ghg='RAMP_CO2_ONLY' diff --git a/cime_config/testdefs/testmods_dirs/cam/co2rmp_usecase/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/co2rmp_usecase/user_nl_cam index 18f6cf7791..660af17e0b 100644 --- a/cime_config/testdefs/testmods_dirs/cam/co2rmp_usecase/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/co2rmp_usecase/user_nl_cam @@ -3,11 +3,12 @@ ndens=1,1,1,1,1,1 nhtfrq=3,3,3,3,3,3 inithist='ENDOFRUN' fexcl1='UU' -fincl1='T:I','PS:I' -fincl2='T:A','PS:A' +fincl1='T','PS' +fincl2='T','PS' fincl3='T:X','PS:X' fincl4='T:M','PS:M' fincl5='PS','U200' fincl6='PS','TREFHTMX','TREFHTMN' +avgflag_pertape='I','A','A','A','I','I' ramp_co2_start_ymd=20000915 scenario_ghg='RAMP_CO2_ONLY' diff --git a/cime_config/testdefs/testmods_dirs/cam/dartcambigens/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/dartcambigens/user_nl_cam index 008f853d1c..add5e93d7f 100644 --- a/cime_config/testdefs/testmods_dirs/cam/dartcambigens/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/dartcambigens/user_nl_cam @@ -1,4 +1,5 @@ inithist = 'ENDOFRUN' empty_htapes = .true. -fincl1 = 'PHIS:I' +fincl1 = 'PHIS' +avgflag_pertape = 'I' nhtfrq = -1 diff --git a/cime_config/testdefs/testmods_dirs/cam/ghgrmp_e8/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/ghgrmp_e8/user_nl_cam index a7ccd4decc..c2b625c6b7 100644 --- a/cime_config/testdefs/testmods_dirs/cam/ghgrmp_e8/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/ghgrmp_e8/user_nl_cam @@ -10,8 +10,8 @@ FINCL2LONLAT = '225e:247e_31n:53n' , '112e:135e_16s:9s' , '157e:179e_11.5s:1 '260.0e_30.0n' , '260.0w_30.0s' , '50w_90.0n' , '60.0e_70.0n' , '90.0w_80.0s' , '8e:32e_50n:54n' , '165e:221e_20s:20n' -FINCL2 = 'T:I ','U:I ','V:I ','Q:I ','DTCOND:I ', - 'PS:I ','PHIS:I ','FU ','FV ','RELHUM:I ', +FINCL2 = 'T ','U ','V ','Q ','DTCOND ', + 'PS ','PHIS ','FU ','FV ','RELHUM ', FINCL3LONLAT = '225e:247e_31n:53n' , '112e:135e_16s:9s' , '157e:179e_11.5s:11.5n', '290e:304e_21s:9s' , '240e:256e_51n:58n' , '160e:211e_30s:30n' , '0e_89s' , '180e_0s' , '0w_0n' , @@ -19,12 +19,12 @@ FINCL3LONLAT = '225e:247e_31n:53n' , '112e:135e_16s:9s' , '157e:179e_11.5s:1 '260.0e_30.0n' , '260.0w_30.0s' , '50w_90.0n' , '60.0e_70.0n' , '90.0w_80.0s' , '8e:32e_50n:54n' , '165e:221e_20s:20n' -FINCL3 = 'T:I ','U:I ','V:I ','Q:I ','DTCOND:I ', - 'PS:I ','PHIS:I ','FU ','FV ','RELHUM:I ', +FINCL3 = 'T ','U ','V ','Q ','DTCOND ', + 'PS ','PHIS ','FU ','FV ','RELHUM ', FINCL4LONLAT = '67.0e_50.0n' , '67.0w_50.0s' -FINCL4 = 'T:I ','U:I ','V:I ','Q:I ','DTCOND:I ', - 'PS:I ','PHIS:I ','FU ','FV ','RELHUM:I ', - +FINCL4 = 'T ','U ','V ','Q ','DTCOND ', + 'PS ','PHIS ','FU ','FV ','RELHUM ', +avgflag_pertape = 'A','I','I','I' collect_column_output = .false.,.false.,.true.,.true. eul_divdampn=1. diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cospsathist/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cospsathist/user_nl_cam index 801587cedd..40f9e14f3d 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cospsathist/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_cospsathist/user_nl_cam @@ -1,13 +1,15 @@ - ndens=1,1,1,1,1,1 - nhtfrq=3,3,3,3,-2,3 - mfilt=1,1,1,1,1,1 + ndens=1,1,1,1,1,1,1,1 + nhtfrq=3,3,3,3,3,3,-2,3 + mfilt=1,1,1,1,1,1,1,1 sathist_track_infile='$DIN_LOC_ROOT/atm/cam/sat/satellite_profilelist_20020125_20101030_c110204_noleap.nc' sathist_fincl = 'Q','T','PS','U','V','FV' - fincl3 = 'Q','T','PS','FV','UWzm:I' - fincl4 = 'Q','T','PS','FV','UWzm:I' - fincl5 = 'Q','T','U','V','PS','FV','UWzm','AEROD_v','TOT_CLD_VISTAU' - lcltod_start = 0,0, 7200,82800,0 - lcltod_stop = 0,0,10800,7200,0 - avgflag_pertape = 'I',' ','L','L','S' + fincl3 = 'Q','T','PS','FV' + fincl4 = 'UWzm' + fincl5 = 'Q','T','PS','FV' + fincl6 = 'UWzm' + fincl7 = 'Q','T','U','V','PS','FV','UWzm','AEROD_v','TOT_CLD_VISTAU' + lcltod_start = 0,0, 7200, 7200,82800,82800,0 + lcltod_stop = 0,0,10800,10800, 7200, 7200,0 + avgflag_pertape = 'I',' ','L','I','L','I','S' do_circulation_diags=.true. fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_diags/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_diags/user_nl_cam index 63b92fe23d..b58e28f8ff 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_diags/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_diags/user_nl_cam @@ -12,5 +12,6 @@ history_waccmx=.true. history_chemistry=.true. history_carma=.true. history_clubb=.true. -fincl2='Uzm:I','Vzm:I','Wzm:I','THzm:I' +fincl2='Uzm','Vzm','Wzm','THzm' +avgflag_pertape='A','I' do_circulation_diags=.true. diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_sathist/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_sathist/user_nl_cam index 5ade04dbb2..6a446ed054 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_sathist/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_sathist/user_nl_cam @@ -1,12 +1,14 @@ - ndens=1,1,1,1,1,1 - nhtfrq=3,3,3,3,-2,3 - mfilt=1,1,1,1,1,1 + ndens=1,1,1,1,1,1,1,1 + nhtfrq=3,3,3,3,3,3,-2,3 + mfilt=1,1,1,1,1,1,1,1 sathist_track_infile='$DIN_LOC_ROOT/atm/cam/sat/satellite_profilelist_20020125_20101030_c110204_noleap.nc' sathist_fincl = 'Q','T','PS','U','V','FV' - fincl3 = 'Q','T','PS','FV','UWzm:I' - fincl4 = 'Q','T','PS','FV','UWzm:I' - fincl5 = 'Q','T','U','V','PS','FV','UWzm','AEROD_v','TOT_CLD_VISTAU' - lcltod_start = 0,0, 7200,82800,0 - lcltod_stop = 0,0,10800,7200,0 - avgflag_pertape = 'I',' ','L','L','S' + fincl3 = 'Q','T','PS','FV' + fincl4 = 'UWzm' + fincl5 = 'Q','T','PS','FV' + fincl6 = 'UWzm' + fincl7 = 'Q','T','U','V','PS','FV','UWzm','AEROD_v','TOT_CLD_VISTAU' + lcltod_start = 0,0, 7200, 7200,82800,82800,0 + lcltod_stop = 0,0,10800,10800, 7200, 7200,0 + avgflag_pertape = 'I',' ','L','I','L','I','S' do_circulation_diags=.true. diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_ttrac/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_ttrac/user_nl_cam index 20883325af..6341903bc0 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_ttrac/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_ttrac/user_nl_cam @@ -5,4 +5,5 @@ inithist='ENDOFRUN' interpolate_output=.false.,.true. interpolate_nlat=0,30 interpolate_nlon=0,60 -fincl2='Q:I','T:I','U:I','V:I','Q_gll:I','T_gll:I','U_gll:I','V_gll:I' +fincl2='Q','T','U','V','Q_gll','T_gll','U_gll','V_gll' +avgflag_pertape='A','A' diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_usecase/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_usecase/user_nl_cam index 0fd89f084b..418592a843 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq3s_usecase/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq3s_usecase/user_nl_cam @@ -3,4 +3,5 @@ ndens=1,1,1,1,1,1 nhtfrq=3,3,3,3,3,3 inithist='ENDOFRUN' pbuf_global_allocate=.false. -fincl2='U:I','V:I','T:I','TTEND_TOT:I','DTCORE:I' +fincl2='U','V','T','TTEND_TOT','DTCORE' +avgflag_pertape='A','I' diff --git a/cime_config/testdefs/testmods_dirs/cam/terminator/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/terminator/user_nl_cam index 83efb36c48..e6e973a573 100644 --- a/cime_config/testdefs/testmods_dirs/cam/terminator/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/terminator/user_nl_cam @@ -2,5 +2,6 @@ mfilt=1,1,1,1,1,1 ndens=1,1,1,1,1,1 nhtfrq=3,3,3,3,3,3 inithist='ENDOFRUN' -fincl2='U:I','V:I','T:I','TTEND_TOT:I','CL:I','CL2:I' +fincl2='U','V','T','TTEND_TOT','CL','CL2' +avgflag_pertape='A','I' diff --git a/src/control/cam_history.F90 b/src/control/cam_history.F90 index 51c357e68b..ce909e9d96 100644 --- a/src/control/cam_history.F90 +++ b/src/control/cam_history.F90 @@ -2447,13 +2447,33 @@ end function get_entry_by_name !####################################################################### - subroutine AvgflagToString(avgflag, time_op) + subroutine AvgflagToString(avgflag, time_op, instantaneous_valid, average_valid) ! Dummy arguments character(len=1), intent(in) :: avgflag ! averaging flag character(len=max_chars), intent(out) :: time_op ! time op (e.g. max) + logical, optional, intent(in) :: instantaneous_valid ! flag for whether it's ok to have instantaneous fields on the tape + logical, optional, intent(in) :: average_valid ! flag for whether it's ok to have average fields on the tape - ! Local variable + ! Local variables character(len=*), parameter :: subname = 'AvgflagToString' + logical :: local_inst_valid + logical :: local_avg_valid + + if (present(instantaneous_valid)) then + local_inst_valid = instantaneous_valid + else + local_inst_valid = .true. + end if + + if (present(average_valid)) then + local_avg_valid = average_valid + else + local_avg_valid = .true. + end if + + if (avgflag /= 'I' .and. .not. local_avg_valid) then + call endrun(subname//': cannot have average fields in instantaneous history file') + end if select case (avgflag) case ('A') @@ -2463,7 +2483,11 @@ subroutine AvgflagToString(avgflag, time_op) case ('N') time_op(:) = 'mean_over_nsteps' case ('I') - time_op(:) = ' ' + if (local_inst_valid) then + time_op(:) = ' ' + else + call endrun(subname//': cannot have instantaneous fields in average history file') + end if case ('X') time_op(:) = 'maximum' case ('M') @@ -2981,8 +3005,11 @@ subroutine inifld (t, listentry, avgflag, prec_wrt) ! Local workspace ! integer :: n ! field index on defined tape + logical :: inst_valid ! instananeous fields allowed on history tape + logical :: avg_valid ! average fields allowed on history tape - + inst_valid = .true. + avg_valid = .true. ! ! Ensure that it is not to late to add a field to the history tape ! @@ -3032,7 +3059,18 @@ subroutine inifld (t, listentry, avgflag, prec_wrt) tape(t)%hlist(n)%time_op = listentry%time_op(t) else tape(t)%hlist(n)%avgflag = avgflag - call AvgflagToString(avgflag, tape(t)%hlist(n)%time_op) + ! Check for tape / field avgflag mismatch + if (avgflag_pertape(t) == 'I' .or. avgflag_pertape(t) == ' ') then ! tape is instantaneous + if (avgflag /= 'I') then ! field is average + avg_valid = .false. ! cannot have average field on instantaneous tape + end if + else ! tape is average + if (avgflag == 'I') then ! field is instantaneous + inst_valid = .false. ! cannot have instantaneous field on average tape + end if + end if + + call AvgflagToString(avgflag, tape(t)%hlist(n)%time_op, instantaneous_valid=inst_valid, average_valid=avg_valid) end if ! Some things can't be done with zonal fields @@ -3932,7 +3970,7 @@ subroutine h_inquire (t) ierr=pio_inq_varid (tape(t)%File,'nscur ', tape(t)%nscurid) ierr=pio_inq_varid (tape(t)%File,'nsteph ', tape(t)%nstephid) - ierr=pio_inq_varid (tape(t)%File,'time_bnds', tape(t)%tbndid) + ierr=pio_inq_varid (tape(t)%File,'time_bounds', tape(t)%tbndid) ierr=pio_inq_varid (tape(t)%File,'date_written',tape(t)%date_writtenid) ierr=pio_inq_varid (tape(t)%File,'time_written',tape(t)%time_writtenid) #if ( defined BFB_CAM_SCAM_IOP ) @@ -4049,6 +4087,11 @@ subroutine add_default (name, tindex, flag) ! integer :: t ! file index type(master_entry), pointer :: listentry + logical :: inst_valid ! instantaneous fields allowed on history tape + logical :: avg_valid ! average fields allowed on history tape + + inst_valid = .true. + avg_valid = .true. if (htapes_defined) then call endrun ('ADD_DEFAULT: Attempt to add hist default '//trim(name)//' after history files set') @@ -4084,7 +4127,17 @@ subroutine add_default (name, tindex, flag) listentry%actflag(t) = .true. if (flag /= ' ') then listentry%avgflag(t) = flag - call AvgflagToString(flag, listentry%time_op(t)) + ! Check for tape / field avgflag mismatch + if (avgflag_pertape(t) == 'I' .or. avgflag_pertape(t) == ' ') then ! tape is instantaneous + if (flag /= 'I') then ! field is average + avg_valid = .false. ! cannot have average field on inst. tape + end if + else ! tape is average + if (flag == 'I') then ! field is instantaneous + inst_valid = .false. ! cannot have inst. field on average tape + end if + end if + call AvgflagToString(flag, listentry%time_op(t), instantaneous_valid=inst_valid, average_valid=avg_valid) end if return @@ -4174,6 +4227,8 @@ subroutine h_define (t, restart) character(len=max_chars) :: cell_methods ! For cell_methods attribute character(len=16) :: time_per_freq character(len=128) :: errormsg + logical :: inst_valid ! instantaneous fields allowed on tape + logical :: avg_valid ! average fields allowed on tape integer :: ret ! function return value @@ -4213,6 +4268,9 @@ subroutine h_define (t, restart) character(len=32) :: cam_take_snapshot_before character(len=32) :: cam_take_snapshot_after + inst_valid = .true. + avg_valid = .true. + call phys_getopts(cam_take_snapshot_before_out= cam_take_snapshot_before, & cam_take_snapshot_after_out = cam_take_snapshot_after, & cam_snapshot_before_num_out = cam_snapshot_before_num, & @@ -4374,9 +4432,9 @@ subroutine h_define (t, restart) if(.not. is_satfile(t)) then - ierr=pio_put_att (tape(t)%File, tape(t)%timeid, 'bounds', 'time_bnds') + ierr=pio_put_att (tape(t)%File, tape(t)%timeid, 'bounds', 'time_bounds') - ierr=pio_def_var (tape(t)%File,'time_bnds',pio_double,(/bnddim,timdim/),tape(t)%tbndid) + ierr=pio_def_var (tape(t)%File,'time_bounds',pio_double,(/bnddim,timdim/),tape(t)%tbndid) ierr=pio_put_att (tape(t)%File, tape(t)%tbndid, 'long_name', 'time interval endpoints') ! ! Character @@ -4539,6 +4597,17 @@ subroutine h_define (t, restart) do f = 1, nflds(t) !! Collect some field properties + ! Check for tape / field avgflag mismatch + if (avgflag_pertape(t) == 'I' .or. avgflag_pertape(t) == ' ') then ! tape is instantaneous + if (tape(t)%hlist(f)%avgflag /= 'I') then ! field is average + avg_valid = .false. ! cannot have average field on inst. tape + end if + else ! tape is average + if (tape(t)%hlist(f)%avgflag == 'I') then ! field is instantaneous + inst_valid = .false. ! cannot have inst. field on average tape + end if + end if +! call AvgflagToString(tape(t)%hlist(f)%avgflag, tape(t)%hlist(f)%time_op, instantaneous_valid=inst_valid, average_valid=avg_valid) call AvgflagToString(tape(t)%hlist(f)%avgflag, tape(t)%hlist(f)%time_op) if ((tape(t)%hlist(f)%hwrt_prec == 8) .or. restart) then ncreal = pio_double @@ -4706,15 +4775,16 @@ subroutine h_define (t, restart) ! Time cell methods is after field method because time averaging is ! applied later (just before output) than field method which is applied ! before outfld call. - str = tape(t)%hlist(f)%time_op - select case (str) - case ('mean', 'maximum', 'minimum', 'standard_deviation') - if (len_trim(cell_methods) > 0) then - cell_methods = trim(cell_methods)//' '//'time: '//str - else - cell_methods = trim(cell_methods)//'time: '//str - end if - end select + if (tape(t)%hlist(f)%avgflag == 'I') then + str = 'instantaneous' + else + str = tape(t)%hlist(f)%time_op + end if + if (len_trim(cell_methods) > 0) then + cell_methods = trim(cell_methods)//' '//'time: '//str + else + cell_methods = trim(cell_methods)//'time: '//str + end if if (len_trim(cell_methods) > 0) then ierr = pio_put_att(tape(t)%File, varid, 'cell_methods', trim(cell_methods)) call cam_pio_handle_error(ierr, & @@ -5556,7 +5626,6 @@ subroutine wshist (rgnht_in) #endif ierr = pio_put_var (tape(t)%File, tape(t)%nstephid,(/start/),(/count1/),(/nstep/)) time = ndcur + nscur/86400._r8 - ierr=pio_put_var (tape(t)%File, tape(t)%timeid, (/start/),(/count1/),(/time/)) startc(1) = 1 startc(2) = start @@ -5568,6 +5637,13 @@ subroutine wshist (rgnht_in) tdata(1) = beg_time(t) tdata(2) = time end if + if (avgflag_pertape(t) /= 'I') then + ! average tape - time is midpoint of time_bounds + ierr=pio_put_var (tape(t)%File, tape(t)%timeid, (/start/),(/count1/),(/(tdata(1) + tdata(2)) / 2._r8/)) + else + ! instantaneous tape - time is current time + ierr=pio_put_var (tape(t)%File, tape(t)%timeid, (/start/),(/count1/),(/time/)) + end if ierr=pio_put_var (tape(t)%File, tape(t)%tbndid, startc, countc, tdata) if(.not.restart) beg_time(t) = time ! update beginning time of next interval startc(1) = 1 diff --git a/src/control/cam_history_support.F90 b/src/control/cam_history_support.F90 index 495ce7b519..d154b66d87 100644 --- a/src/control/cam_history_support.F90 +++ b/src/control/cam_history_support.F90 @@ -220,7 +220,7 @@ module cam_history_support #endif type(var_desc_t) :: nstephid ! var id for current timestep type(var_desc_t) :: timeid ! var id for time - type(var_desc_t) :: tbndid ! var id for time_bnds + type(var_desc_t) :: tbndid ! var id for time_bounds type(var_desc_t) :: date_writtenid ! var id for date time sample written type(var_desc_t) :: time_writtenid ! var id for time time sample written type(var_desc_t) :: f107id ! var id for f107