Skip to content

Commit 6c1f31f

Browse files
mvertensmvertens
committed
new namelist settings for nearest_lat mapping for co2 surface override
1 parent 7881c97 commit 6c1f31f

4 files changed

Lines changed: 25 additions & 14 deletions

File tree

‎bld/build-namelist‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,13 +717,18 @@ if (!($simple_phys or $aqua_mode)) {
717717
add_default($nl, 'co2_surface_source');
718718
if ($nl->get_value('co2_surface_source') =~ /$TRUE/io) {
719719
if ( !(defined $nl->get_value('stream_co2_surface_source_mesh_filename') and
720-
defined $nl->get_value('stream_co2_surface_source_data_filename') and
720+
defined $nl->get_value('stream_co2_surface_source_data_filename') and
721721
defined $nl->get_value('stream_co2_surface_source_data_varname') and
722722
defined $nl->get_value('stream_co2_surface_source_year_first') and
723723
defined $nl->get_value('stream_co2_surface_source_year_last') and
724724
defined $nl->get_value('stream_co2_surface_source_year_align') and
725+
defined $nl->get_value('stream_co2_surface_source_year_align') and
726+
defined $nl->get_value('stream_co2_surface_source_mapalgo') and
727+
defined $nl->get_value('stream_co2_surface_source_lat_dimname') and
725728
defined $nl->get_value('stream_co2_surface_source_taxmode') ) ) {
726729
die "$ProgName - ERROR: if co2_surface_source is .true. then the following must be defined:
730+
stream_co2_surface_source_mapalgo,
731+
stream_co2_surface_source_lat_dimname,
727732
stream_co2_surface_source_mesh_filename,
728733
stream_co2_surface_source_data_filename,
729734
stream_co2_surface_source_data_varname,
@@ -732,6 +737,11 @@ if (!($simple_phys or $aqua_mode)) {
732737
stream_co2_surface_source_year_last,
733738
stream_co2_surface_source_year_align\n";
734739
}
740+
if (($nl->get_value('stream_co2_surface_source_mapalgo') eq 'nearest_lat') and
741+
($nl->get_value('stream_co2_surface_source_mesh_filename') ne 'none')) {
742+
die "$ProgName - ERROR: if stream_co2_surface_source_mesh_filename must equal none if \n
743+
stream_co2_surface_source_mapalgo is nearest_lat"
744+
}
735745
}
736746
}
737747

‎bld/namelist_files/namelist_defaults_cam.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,9 +2012,6 @@
20122012

20132013
<!-- co2 surface source (overwrite co2_diag sent to land and ocean) -->
20142014
<co2_surface_source>.false.</co2_surface_source>
2015-
<co2_surface_source_mapalgo>nearest_lat</co2_surface_source_mapalgo>
2016-
<co2_surface_source_mesh_filename>none</co2_surface_source_mesh_filename>
2017-
<co2_surface_source_lat_dimname>lat</co2_surface_source_lat_dimname>
20182015

20192016
<!-- nitrogen deposition to surface components -->
20202017
<stream_ndep_varlist>NDEP_NHx_month:NDEP_NOy_month</stream_ndep_varlist>

‎bld/namelist_files/namelist_definition.xml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10297,22 +10297,24 @@ Default: path
1029710297
If TRUE, set co2_diag sent to land and ocean to value read from co2_surface_source_data_filename
1029810298
Default: FALSE
1029910299
</entry>
10300-
<entry id="co2_surface_source_mapalgo" type="char*256" category="CO2 surface source"
10300+
<entry id="stream_co2_surface_source_mapalgo" type="char*256" category="CO2 surface source"
1030110301
group="co2_surface_source_stream_nl" valid_values="nearest_lat,bilinear,consf" >
1030210302
Mapping algorithm to map co2 data to model grid. Nearest lat assumes
1030310303
that a mesh file is not needed and that the forcing data is lat/time or lat/lev/time.
1030410304
In this case the mesh is set to none.
1030510305
Default: nearest_lat
1030610306
</entry>
10307-
<entry id="stream_co2_surface_source_lat_dimname" type="char*256" input_pathname="abs" category="CO2 surface source"
10307+
<entry id="stream_co2_surface_source_lat_dimname" type="char*256" category="CO2 surface source"
1030810308
group="co2_surface_source_stream_nl" valid_values="" >
10309-
Latitude dimension name on stream_co2_surface_source_data_filename. Only used if co2_surface_source_mapalgo is 'nearest_lat'
10310-
Default: lat
10309+
Latitude dimension name on stream_co2_surface_source_data_filename.
10310+
Only used if stream_co2_surface_source_mapalgo is 'nearest_lat'
10311+
Default: Must be set by user
1031110312
</entry>
1031210313
<entry id="stream_co2_surface_source_mesh_filename" type="char*256" input_pathname="abs" category="CO2 surface source"
1031310314
group="co2_surface_source_stream_nl" valid_values="" >
10314-
Grid mesh file corresponding to stream_co2_surface_source_data_filename.
10315-
Default: none
10315+
Grid mesh file corresponding to stream_co2_surface_source_data_filename. If stream_co2_surface_source_map
10316+
If stream_co2_surface_source_mapalgo is 'nearest_lat' then this must be set to 'none'
10317+
Default: Must be set by user.
1031610318
</entry>
1031710319
<entry id="stream_co2_surface_source_data_filename" type="char*256" input_pathname="abs" category="CO2 surface source"
1031810320
group="co2_surface_source_stream_nl" valid_values="" >

‎src/cpl/nuopc/atm_stream_co2.F90‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ module atm_stream_co2
2727
type(shr_strdata_type) :: sdat_co2_surface_source ! input data stream
2828

2929
! namelist variables
30-
character(len=CL) :: stream_co2_surface_source_mapalgo
31-
character(len=CL) :: stream_co2_surface_source_lat_dimname
30+
character(len=CS) :: stream_co2_surface_source_mapalgo
31+
character(len=CS) :: stream_co2_surface_source_lat_dimname
3232
character(len=CL) :: stream_co2_surface_source_mesh_filename
3333
character(len=CL) :: stream_co2_surface_source_data_filename
3434
character(len=CL) :: stream_co2_surface_source_data_varname ! variable name for co2_surface_source on stream file(s)
@@ -64,6 +64,8 @@ subroutine stream_co2_surface_source_readnl(nlfile)
6464

6565
namelist /co2_surface_source_stream_nl/ &
6666
co2_surface_source, &
67+
stream_co2_surface_source_mapalgo, &
68+
stream_co2_surface_source_lat_dimname, &
6769
stream_co2_surface_source_mesh_filename, &
6870
stream_co2_surface_source_data_filename, &
6971
stream_co2_surface_source_data_varname, &
@@ -74,10 +76,10 @@ subroutine stream_co2_surface_source_readnl(nlfile)
7476

7577
! Default values for namelist
7678
co2_surface_source = .false.
77-
stream_co2_surface_source_mapalgo = 'none'
79+
stream_co2_surface_source_mapalgo = 'nearest_lat'
7880
stream_co2_surface_source_lat_dimname = 'lat'
81+
stream_co2_surface_source_mesh_filename = 'none'
7982
stream_co2_surface_source_data_filename = ' '
80-
stream_co2_surface_source_mesh_filename = ' '
8183
stream_co2_surface_source_data_varname = ' '
8284
stream_co2_surface_source_taxmode = 'unset'
8385
stream_co2_surface_source_year_first = -999 ! first year in stream to use

0 commit comments

Comments
 (0)