Skip to content

Commit

Permalink
Merge branch 'cesm3_0_beta04_changes' into ne3np4_to_defaults_and_mak…
Browse files Browse the repository at this point in the history 
…efile
  • Loading branch information
@slevis-lmwg
slevis-lmwg committed Nov 8, 2024
2 parents 87afe5c + 3d811ca commit a389e6d
Show file tree
Hide file tree
Showing 8 changed files with 89 additions and 70 deletions.
7 changes: 6 additions & 1 deletion bld/CLMBuildNamelist.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,11 @@ sub setup_cmdl_chk_res {
}
}

sub begins_with
{
return substr($_[0], 0, length($_[1])) eq $_[1];
}

sub setup_cmdl_resolution {
my ($opts, $nl_flags, $definition, $defaults, $envxml_ref) = @_;

Expand Down Expand Up @@ -713,7 +718,7 @@ sub setup_cmdl_resolution {
$nl_flags->{'neon'} = ".false.";
$nl_flags->{'neonsite'} = "";
if ( $nl_flags->{'res'} eq "CLM_USRDAT" ) {
if ( $opts->{'clm_usr_name'} eq "NEON" ) {
if ( begins_with($opts->{'clm_usr_name'}, "NEON") ) {
$nl_flags->{'neon'} = ".true.";
$nl_flags->{'neonsite'} = $envxml_ref->{'NEONSITE'};
$log->verbose_message( "This is a NEON site with NEONSITE = " . $nl_flags->{'neonsite'} );
Expand Down
57 changes: 30 additions & 27 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1618,22 +1618,13 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa15_hist_2000_16pfts_c240908.nc</f
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa3p75_hist_2000_16pfts_c240908.nc</fsurdat>

<!-- fsurdat files with 78 PFTS -->
<!-- The same files can be used with use_vichydro='.true.' or '.false' -->
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true." use_vichydro=".true.">
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="2000" use_crop=".true." use_vichydro=".false.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." use_vichydro=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true." use_vichydro=".false.">
<fsurdat hgrid="1.9x2.5" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." use_vichydro=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true." use_vichydro=".false.">
<fsurdat hgrid="10x15" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true." use_vichydro=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true." use_vichydro=".false.">
<fsurdat hgrid="4x5" sim_year="2000" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_2000_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="1x1_brazil" sim_year="2000">
Expand Down Expand Up @@ -1695,29 +1686,36 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/surfdata_1x1_urbanc_alpha_synth_hist_

<!-- for pre-industrial simulations - year 1850 -->

<!-- fsurdat files with 16 PFTS for use with PPE and/or FATES -->
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".false.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_1850_16pfts_c240926.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="1850" use_crop=".false.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_1850_16pfts_c241007.nc</fsurdat>

<!-- fsurdat files with 78 PFTS -->
<fsurdat hgrid="360x720cru" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_360x720cru_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="0.9x1.25" sim_year="1850" >
<fsurdat hgrid="0.9x1.25" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_0.9x1.25_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="1.9x2.5" sim_year="1850" >
<fsurdat hgrid="1.9x2.5" sim_year="1850" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1.9x2.5_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="10x15" sim_year="1850" >
<fsurdat hgrid="10x15" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_10x15_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="4x5" sim_year="1850" >
<fsurdat hgrid="4x5" sim_year="1850" use_crop=".true.">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_4x5_hist_1850_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="mpasa480" sim_year="1850" >
<fsurdat hgrid="mpasa480" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa480_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="mpasa120" sim_year="1850" >
<fsurdat hgrid="mpasa120" sim_year="1850" >
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa120_hist_1850_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="ne30np4" sim_year="1850">
<fsurdat hgrid="ne30np4" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg2" sim_year="1850">
<fsurdat hgrid="ne30np4.pg2" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne30np4.pg3" sim_year="1850">
<fsurdat hgrid="ne30np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_1850_78pfts_c240925.nc</fsurdat>
Expand Down Expand Up @@ -1768,9 +1766,16 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
-->

<!-- Historical 1850-2000 -->
<!-- PPE and/or FATES need 16-pft landuse files -->
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" use_crop=".false."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_1.9x2.5_hist_1850-2023_16pfts_c240926.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000" use_crop=".false."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_4x5_hist_1850-2023_16pfts_c241007.nc</flanduse_timeseries>

<!-- 78-pft landuse files -->
<flanduse_timeseries hgrid="0.9x1.25" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000" use_crop=".true."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4.ARCTICGRIS.ne30x8" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4.ARCTICGRIS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
Expand All @@ -1780,9 +1785,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4.POLARCAP.ne30x4_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4CONUS.ne30x8" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4CONUS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
<!-- Do we need both use_crop=".false." and ".true." for FATES transient? -->
<!-- As of 2024/02/02 the Grids Support spreadsheet includes no 16-pft landuse files. -->
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000"
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000" use_crop=".true."
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_4x5_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="10x15" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_10x15_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
Expand Down
27 changes: 26 additions & 1 deletion bld/unit_testers/build-namelist_test.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,31 @@ sub cat_and_create_namelistinfile {
}
}
print "\n===============================================================================\n";
print "Test setting drv_flds_in fields in CAM, clm60 only";
print "=================================================================================\n";
foreach my $phys ( "clm6_0" ) {
$mode = "-phys $phys CAM_SETS_DRV_FLDS";
&make_config_cache($phys);
foreach my $options (
"--res ne0np4.POLARCAP.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
) {
&make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" );
eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); };
is( $@, '', "options: $options" );
$cfiles->checkfilesexist( "$options", $mode );
$cfiles->shownmldiff( "default", $mode );
if ( defined($opts{'compare'}) ) {
$cfiles->doNOTdodiffonfile( "$tempfile", "$options", $mode );
$cfiles->dodiffonfile( "lnd_in", "$options", $mode );
$cfiles->comparefiles( "$options", $mode, $opts{'compare'} );
}
if ( defined($opts{'generate'}) ) {
$cfiles->copyfiles( "$options", $mode );
}
&cleanup();
}
}
print "\n===============================================================================\n";
print "Test setting drv_flds_in fields in CAM";
print "=================================================================================\n";
foreach my $phys ( "clm5_0", "clm6_0" ) {
Expand All @@ -515,7 +540,6 @@ sub cat_and_create_namelistinfile {
"--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm",
"--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res 1.9x2.5 --mask gx1v7 --bgc sp -no-crop --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.POLARCAP.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.ARCTIC.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.ARCTICGRIS.ne30x8 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4CONUS.ne30x8 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
Expand Down Expand Up @@ -546,6 +570,7 @@ sub cat_and_create_namelistinfile {
"--res 0.9x1.25 --bgc sp --use_case 1850-2100_SSP2-4.5_transient --namelist '&a start_ymd=18501223/'",
"-bgc fates -use_case 2000_control -no-megan",
"-bgc fates -use_case 20thC_transient -no-megan",
"-bgc fates -use_case 20thC_transient -no-megan -no-crop --res 4x5",
"-bgc fates -use_case 1850_control -no-megan -namelist \"&a use_fates_sp=T, soil_decomp_method='None'/\"",
"-bgc sp -use_case 2000_control -res 0.9x1.25 -namelist '&a use_soil_moisture_streams = T/'",
"--res 1.9x2.5 --bgc bgc --use_case 1850-2100_SSP2-4.5_transient --namelist '&a start_ymd=19101023/'",
Expand Down
30 changes: 4 additions & 26 deletions cime_config/testdefs/ExpectedTestFails.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@
</test>

<test name="SMS_Ld5.f09_g17.IHistClm50Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
</test>
<test name="SMS_Ld5.f19_g17.IHistClm50Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
</test>
<test name="SMS_Ld5.f09_g17.IHistClm60Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
</test>
<test name="SMS_Ld5.f19_g17.IHistClm60Sp.derecho_intel.clm-nofire">
<phase name="RUN">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2784</issue>
</phase>
Expand Down Expand Up @@ -84,28 +84,6 @@
</phase>
</test>

<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.izumi_nag.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2780</issue>
<comment>Crashes in the matrix solver.</comment>
</phase>
</test>
<test name="SMS_Ld10_D_Mmpi-serial.CLM_USRDAT.I1PtClm60Bgc.derecho_gnu.clm-default--clm-NEON-HARV--clm-matrixcnOn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2780</issue>
<comment>Crashes in the matrix solver.</comment>
</phase>
</test>
<test name="SMS_D.1x1_brazil.I1850Clm60BgcCrop.derecho_gnu.clm-mimics_matrixcn">
<phase name="RUN">
<status>FAIL</status>
<issue>#2780</issue>
<comment>Crashes in the matrix solver.</comment>
</phase>
</test>

<test name="ERP_P64x2_Lm13.f10_f10_mg37.IHistClm60Bgc.derecho_intel.clm-monthly--clm-matrixcnOn_ignore_warnings">
<phase name="BASELINE">
<status>FAIL</status>
Expand Down
13 changes: 1 addition & 12 deletions cime_config/testdefs/testlist_clm.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2065,24 +2065,13 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run POLARCAP for transient case starting in 1979 as for AMIP CAM cases (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
<option name="comment" >Clm50 because that is what CAM tests currently; remove when CAM tests for Clm60</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Repeat POLARCAP transient starting in 1979 for Clm60"</option>
<option name="comment" >Run POLARCAP for transient case starting in 1979 as for AMIP CAM cases (no need to run this high core count test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
Expand Down
10 changes: 10 additions & 0 deletions python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
"global-present",
"global-present-low-res",
"global-present-ultra-hi-res",
"global-hist-1850-f19",
"global-hist-1850-f45",
"crop-tropics-present",
"crop",
"crop-global-present",
Expand Down Expand Up @@ -242,6 +244,14 @@ def main():
"--start-year 2000 --end-year 2000 --nocrop --res",
"ultra_hi_res_no_crop",
),
"global-hist-1850-f19": (
"--start-year 1850 --end-year 2023 --nocrop --res",
"f19",
),
"global-hist-1850-f45": (
"--start-year 1850 --end-year 2023 --nocrop --res",
"f45",
),
"crop-tropics-present": (
"--start-year 2000 --end-year 2000 --res",
"5x5_amazon",
Expand Down
6 changes: 3 additions & 3 deletions src/utils/SparseMatrixMultiplyMod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ subroutine SPMP_ABC(this,num_unit,filter_u,A,B,C,list_ready,list_A,list_B,list_C
call endrun( subname//" ERROR: missing required optional arguments" )
return
end if
SHR_ASSERT_FL((size(filter_actunit_A) > num_actunit_A), sourcefile, __LINE__)
SHR_ASSERT_FL((size(filter_actunit_A) >= num_actunit_A), sourcefile, __LINE__)
end if
if(present(num_actunit_B))then
if(num_actunit_B < 0)then
Expand All @@ -1230,7 +1230,7 @@ subroutine SPMP_ABC(this,num_unit,filter_u,A,B,C,list_ready,list_A,list_B,list_C
call endrun( subname//" ERROR: missing required optional arguments" )
return
end if
SHR_ASSERT_FL((size(filter_actunit_B) > num_actunit_B), sourcefile, __LINE__)
SHR_ASSERT_FL((size(filter_actunit_B) >= num_actunit_B), sourcefile, __LINE__)
end if
if(present(num_actunit_C))then
if(num_actunit_C < 0)then
Expand All @@ -1243,7 +1243,7 @@ subroutine SPMP_ABC(this,num_unit,filter_u,A,B,C,list_ready,list_A,list_B,list_C
call endrun( subname//" ERROR: missing required optional arguments" )
return
end if
SHR_ASSERT_FL((size(filter_actunit_C) > num_actunit_C), sourcefile, __LINE__)
SHR_ASSERT_FL((size(filter_actunit_C) >= num_actunit_C), sourcefile, __LINE__)
end if

if(.not. list_ready)then
Expand Down
9 changes: 9 additions & 0 deletions tools/mksurfdata_esmf/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,13 @@ SUBSETDATA_1X1_URBALPHA := --lat -37.7308 --lon 0 --site 1x1_urbanc_alpha --o
# low-res is for low resolutions for testing
# nldas is for NWP working with WRF
# STANDARD means no crop, so 16 pfts
# global-hist-1850-f45 is used by FATES and we expect it to be phased out
STANDARD = \
global-potveg \
global-present \
global-present-low-res \
global-hist-1850-f19 \
global-hist-1850-f45 \

CROP = \
crop-global-future \
Expand Down Expand Up @@ -153,6 +156,12 @@ global-present-low-res : FORCE
$(MKSURFDATA) --number-of-nodes 1 --tasks-per-node 64 --scenario $@ --jobscript-file $@.sh --walltime 01:00:00
$(BATCHJOBS) $@.sh

global-hist-1850-f19 : FORCE
$(MKSURFDATA) --number-of-nodes 8 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh
global-hist-1850-f45 : FORCE
$(MKSURFDATA) --number-of-nodes 2 --scenario $@ --jobscript-file $@.sh --walltime 12:00:00
$(BATCHJOBS) $@.sh
#
# Ultra high resolutions (Don't do by default user should select this by hand)
#
Expand Down

0 comments on commit a389e6d

Please sign in to comment.