Skip to content

Aux cpl hist daily improvements to namelist_definition_drv.xml descriptions, comments #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kdraeder wants to merge 4 commits into
base: history_n
Choose a base branch
from
Open

Aux cpl hist daily improvements to namelist_definition_drv.xml descriptions, comments #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aab35a
Merge pull request #1 from jedwards4b/history_n
kdraeder May 11, 2023
b60c9d7
Candidate fixes of descriptions and comments
kdraeder May 11, 2023
42a5fd5
remove dead code
jedwards4b May 11, 2023
96206b6
adjust indentation
jedwards4b May 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions cime_config/namelist_definition_drv.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,7 +1235,7 @@
</values>
</entry>

<!-- MED histaux atm2med file1 -->
<!-- MED histaux atm2med file 1 -->
<entry id="histaux_atm2med_file1_enabled">
<type>logical</type>
<category>aux_hist</category>
Expand Down Expand Up @@ -1267,7 +1267,7 @@
<type>integer</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>history option type</desc>
<desc>history option span</desc>
<values>
<value>1</value>
</values>
Expand Down Expand Up @@ -1300,7 +1300,7 @@
</values>
</entry>

<!-- MED histaux atm2med file2 -->
<!-- MED histaux atm2med file 2 -->
<entry id="histaux_atm2med_file2_enabled">
<type>logical</type>
<category>aux_hist</category>
Expand Down Expand Up @@ -1332,7 +1332,7 @@
<type>integer</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>history option type</desc>
<desc>history option span</desc>
<values>
<value>1</value>
</values>
Expand Down Expand Up @@ -1365,7 +1365,7 @@
</values>
</entry>

<!-- MED histaux atm2med file3 -->
<!-- MED histaux atm2med file 3 -->
<entry id="histaux_atm2med_file3_enabled">
<type>logical</type>
<category>aux_hist</category>
Expand All @@ -1381,7 +1381,7 @@
<type>char</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>Auxiliary mediator atm2med precipitation history output every 3 hours</desc>
<desc>Auxiliary mediator atm2med precipitation fields history output every 3 hours</desc>
<values>
<value>Faxa_rainc:Faxa_rainl:Faxa_snowc:Faxa_snowl</value>
</values>
Expand All @@ -1399,7 +1399,7 @@
<type>integer</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>history option type</desc>
<desc>history option span</desc>
<values>
<value>3</value>
</values>
Expand Down Expand Up @@ -1432,13 +1432,13 @@
</values>
</entry>

<!-- MED histaux atm2med file4 -->
<!-- MED histaux atm2med file 4 -->
<entry id="histaux_atm2med_file4_enabled">
<type>logical</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>
Auxiliary mediator a2x precipitation history output every 3 hours
Auxiliary mediator a2x dynamic, radiation, and precipitation history output every 3 hours
</desc>
<values>
<value>.false.</value>
Expand All @@ -1449,7 +1449,7 @@
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>
Auxiliary mediator a2x precipitation history output every 3 hours
Auxiliary mediator a2x dynamic, radiation, and precipitation fields history output every 3 hours
</desc>
<values>
<value>Sa_z:Sa_topo:Sa_u:Sa_v:Sa_tbot:Sa_ptem:Sa_shum:Sa_dens:Sa_pbot:Sa_pslv:Faxa_lwdn:Faxa_rainc:Faxa_rainl:Faxa_snowc:Faxa_snowl:Faxa_swndr:Faxa_swvdr:Faxa_swndf:Faxa_swvdf:Sa_co2diag:Sa_co2prog</value>
Expand All @@ -1468,7 +1468,7 @@
<type>integer</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>history option type</desc>
<desc>history option span</desc>
<values>
<value>3</value>
</values>
Expand Down Expand Up @@ -1501,12 +1501,12 @@
</values>
</entry>

<!-- MED histaux atm2med file5 -->
<!-- MED histaux atm2med file 5 -->
<entry id="histaux_atm2med_file5_enabled">
<type>logical</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>Auxiliary mediator a2x precipitation history output every 3 hours</desc>
<desc>Auxiliary mediator a2x aerosol and ghg history output daily or endofrun</desc>
<values>
<value>.false.</value>
</values>
Expand All @@ -1515,7 +1515,7 @@
<type>char</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>Auxiliary mediator a2x precipitation history output every 3 hours</desc>
<desc>Auxiliary mediator a2x aerosol and ghg history output daily or endofrun</desc>
<values>
<value>Faxa_bcph:Faxa_ocph:Faxa_dstwet:Faxa_dstdry:Sa_co2prog:Sa_co2diag</value>
</values>
Expand All @@ -1533,9 +1533,9 @@
<type>integer</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>history option type</desc>
<desc>history option span</desc>
<values>
<value>1</value>
<value>3</value>
</values>
</entry>
<entry id="histaux_atm2med_file5_doavg">
Expand All @@ -1553,7 +1553,7 @@
<group>MED_attributes</group>
<desc>Number of time samples per file.</desc>
<values>
<value>1</value>
<value>2</value>
</values>
</entry>
<entry id="histaux_atm2med_file5_auxname">
Expand Down Expand Up @@ -1801,7 +1801,7 @@
<!-- MED ocn history files -->
<!-- ======================================= -->

<!-- MED histaux ocn2med file1 -->
<!-- MED histaux ocn2med file 1 -->
<entry id="histaux_ocn2med_file1_enabled">
<type>logical</type>
<category>aux_hist</category>
Expand Down Expand Up @@ -1978,7 +1978,7 @@
<type>char</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>Auxiliary mediator rof2med precipitation history output.</desc>
<desc>Auxiliary mediator rof2med precipitation fields history output.</desc>
<values>
<value>all</value>
</values>
Expand All @@ -1996,9 +1996,9 @@
<type>integer</type>
<category>aux_hist</category>
<group>MED_attributes</group>
<desc>history option type</desc>
<desc>history option span</desc>
<values>
<value>6</value>
<value>3</value>
</values>
</entry>
<entry id="histaux_rof2med_file1_doavg">
Expand All @@ -2016,7 +2016,7 @@
<group>MED_attributes</group>
<desc>Number of time samples per file.</desc>
<values>
<value>1</value>
<value>2</value>
</values>
</entry>
<entry id="histaux_rof2med_file1_auxname">
Expand Down
17 changes: 0 additions & 17 deletions mediator/med_io_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,6 @@ module med_io_mod
character(*),parameter :: prefix = "med_io_"
character(*),parameter :: modName = "(med_io_mod) "
character(*),parameter :: version = "cmeps0"
integer , parameter :: number_strlen = 8
integer , parameter :: file_desc_t_cnt = 20 ! Note - this is hard-wired for now

! character(CL) :: wfilename(0:file_desc_t_cnt) = ''

integer :: pio_iotype
integer :: pio_ioformat
Expand Down Expand Up @@ -546,9 +542,6 @@ subroutine med_io_wopen(filename, io_file, vm, rc, clobber, file_ind, model_doi_

if (.not. pio_file_is_open(io_file)) then

! filename not open
! wfilename(lfile_ind) = trim(filename)

if (med_io_file_exists(vm, filename)) then
if (lclobber) then
nmode = pio_clobber
Expand Down Expand Up @@ -585,16 +578,6 @@ subroutine med_io_wopen(filename, io_file, vm, rc, clobber, file_ind, model_doi_
rcode = pio_put_att(io_file,pio_global,"model_doi_url",lmodel_doi_url)
endif

! elseif (trim(wfilename(lfile_ind)) /= trim(filename)) then
! filename is open, better match open filename
! if (iam==0) then
! write(logunit,'(a)') trim(subname)//' different filename currently open '//trim(filename)
! write(logunit,'(a)') trim(subname)//' different wfilename currently open '//trim(wfilename(lfile_ind))
! end if
! call ESMF_LogWrite(trim(subname)//'different file currently open '//trim(filename), ESMF_LOGMSG_ERROR)
! rc = ESMF_FAILURE
! return

else
! filename is already open, just return
endif
Expand Down
6 changes: 3 additions & 3 deletions mediator/med_phases_history_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ module med_phases_history_mod
! Instantaneous history files datatypes/variables per component
! ----------------------------
type, public :: instfile_type
type(file_desc_t) :: io_file
type(file_desc_t):: io_file
logical :: write_inst
character(CS) :: hist_option
integer :: hist_n
Expand All @@ -76,7 +76,7 @@ module med_phases_history_mod
! Time averaging history files
! ----------------------------
type, public :: avgfile_type
type(file_desc_t) :: io_file
type(file_desc_t) :: io_file
logical :: write_avg
type(ESMF_FieldBundle) :: FBaccum_import ! field bundle for time averaging
integer :: accumcnt_import ! field bundle accumulation counter
Expand All @@ -96,7 +96,7 @@ module med_phases_history_mod
! Auxiliary history files
! ----------------------------
type, public :: auxfile_type
type(file_desc_t) :: io_file
type(file_desc_t) :: io_file
character(CS), allocatable :: flds(:) ! array of aux field names
character(CS) :: auxname ! name for history file creation
character(CL) :: histfile = '' ! current history file name
Expand Down