@@ -3779,15 +3779,14 @@ sub setup_logic_c_isotope {
37793779 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' use_c14_bombspike' , ' use_c14' => $use_c14 );
37803780 $use_c14_bombspike = $nl -> get_value(' use_c14_bombspike' );
37813781 if ( &value_is_true($use_c14_bombspike ) ) {
3782- if ( defined ( $stream_fldfilename_atm_c14 ) ) {
3783- &add_logical_to_nl_flags( $nl_flags , $nl , " use_c14_bombspike " );
3784- setup_logic_c14_streams( $opts , $nl_flags , $definition , $defaults , $nl );
3785- } else {
3782+ &add_logical_to_nl_flags( $nl_flags , $nl , " use_c14_bombspike " );
3783+ setup_logic_c14_streams( $opts , $nl_flags , $definition , $defaults , $nl );
3784+ $stream_fldfilename_atm_c14 = $nl -> get_value( ' stream_fldfilename_atm_c14 ' );
3785+ if ( ! defined ( $stream_fldfilename_atm_c14 ) ) {
37863786 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' atm_c14_filename' ,
37873787 ' use_c14' => $use_c14 , ' use_cn' => $nl_flags -> {' use_cn' }, ' use_c14_bombspike' => $nl -> get_value(' use_c14_bombspike' ),
3788- ' ssp_rcp' => $nl_flags -> {' ssp_rcp' } );
3788+ ' ssp_rcp' => $nl_flags -> {' ssp_rcp' }, ' cmip_era ' => $nl_flags -> { ' cmip_era ' } );
37893789 }
3790- $stream_fldfilename_atm_c14 = $nl -> get_value(' stream_fldfilename_atm_c14' );
37913790 $atm_c14_filename = $nl -> get_value(' atm_c14_filename' );
37923791 if ( defined ($stream_fldfilename_atm_c14 ) && defined ($atm_c14_filename ) ) {
37933792 $log -> fatal_error(" Both stream_fldfilename_atm_c14 and atm_c14_filename set, only one should be set" );
@@ -3809,15 +3808,14 @@ sub setup_logic_c_isotope {
38093808 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' use_c13_timeseries' , ' use_c13' => $use_c13 );
38103809 $use_c13_timeseries = $nl -> get_value(' use_c13_timeseries' );
38113810 if ( &value_is_true($use_c13_timeseries ) ) {
3812- if ( defined ( $stream_fldfilename_atm_c13 ) ) {
3813- &add_logical_to_nl_flags( $nl_flags , $nl , " use_c13_timeseries " );
3814- setup_logic_c13_streams( $opts , $nl_flags , $definition , $defaults , $nl );
3815- } else {
3811+ &add_logical_to_nl_flags( $nl_flags , $nl , " use_c13_timeseries " );
3812+ setup_logic_c13_streams( $opts , $nl_flags , $definition , $defaults , $nl );
3813+ $stream_fldfilename_atm_c13 = $nl -> get_value( ' stream_fldfilename_atm_c13 ' );
3814+ if ( ! defined ( $nl -> get_value( ' stream_fldfilename_atm_c13 ' )) ) {
38163815 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' atm_c13_filename' ,
38173816 ' use_c13' => $use_c13 , ' use_cn' => $nl_flags -> {' use_cn' }, ' use_c13_timeseries' => $nl -> get_value(' use_c13_timeseries' ),
38183817 ' ssp_rcp' => $nl_flags -> {' ssp_rcp' } );
38193818 }
3820- $stream_fldfilename_atm_c13 = $nl -> get_value(' stream_fldfilename_atm_c13' );
38213819 $atm_c13_filename = $nl -> get_value(' atm_c13_filename' );
38223820 if ( defined ($stream_fldfilename_atm_c13 ) && defined ($atm_c13_filename ) ) {
38233821 $log -> fatal_error(" Both stream_fldfilename_atm_c13 and atm_c13_filename set, only one should be set" );
@@ -3859,7 +3857,11 @@ sub setup_logic_c13_streams {
38593857
38603858 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' stream_fldfilename_atm_c13' ,
38613859 ' use_c13' => $nl_flags -> {' use_c13' }, ' use_c13_timeseries' => $nl_flags -> {' use_c13_timeseries' },
3862- ' ssp_rcp' => $nl_flags -> {' ssp_rcp' });
3860+ ' ssp_rcp' => $nl_flags -> {' ssp_rcp' }, ' cmip_era' => $nl_flags -> {' cmip_era' }, ' nofail' => 1);
3861+ # If stream_fldfilename_atm_c13 is not defined then return and get the cmip6 file format version
3862+ if ( ! defined ( $nl -> get_value( " stream_fldfilename_atm_c13" ) ) ) {
3863+ return ;
3864+ }
38633865
38643866 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' stream_year_first_atm_c13' ,
38653867 ' sim_year' => $nl_flags -> {' sim_year' }, ' sim_year_range' => $nl_flags -> {' sim_year_range' });
@@ -3885,13 +3887,16 @@ sub setup_logic_c14_streams {
38853887
38863888 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' stream_fldfilename_atm_c14' ,
38873889 ' use_c14' => $nl_flags -> {' use_c14' }, ' use_c14_bombspike' => $nl_flags -> {' use_c14_bombspike' },
3888- ' ssp_rcp' => $nl_flags -> {' ssp_rcp' });
3890+ ' ssp_rcp' => $nl_flags -> {' ssp_rcp' }, ' nofail' => 1);
3891+ # If stream_fldfilename_atm_c14 is not defined then return and get the cmip6 file format version
3892+ if ( ! defined ( $nl -> get_value( " stream_fldfilename_atm_c14" ) ) ) {
3893+ return ;
3894+ }
38893895
3890- add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' stream_meshfile_atm_c14' ,
3896+ add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' stream_meshfile_atm_c14' ,
38913897 ' use_c14' => $nl_flags -> {' use_c14' }, ' use_c14_bombspike' => $nl_flags -> {' use_c14_bombspike' });
38923898 if ( &remove_leading_and_trailing_quotes( $nl -> get_value( " stream_meshfile_atm_c14" ) ) eq " none" ) {
3893- # TODP: Change this to a fatal when we start using this
3894- $log -> warning( " stream_meshfile_atm_c14 is set to 'none' which will only copy the first latitude to the globe" )
3899+ $log -> fatal_error( " stream_meshfile_atm_c14 is set to 'none' which will only copy the first latitude to the globe" )
38953900 }
38963901
38973902 add_default($opts , $nl_flags -> {' inputdata_rootdir' }, $definition , $defaults , $nl , ' stream_year_first_atm_c14' ,
0 commit comments