Skip to content

Commit

Permalink
Merge pull request #1805 from jedwards4b/seq_comm_mct_refactor
Browse files Browse the repository at this point in the history
seq_comm_mct code cleanup
Refactored to get rid of a lot of repeated code. This will help with the multi_driver branch.
Also remove some un-needed esmf code.

Test suite: cesm2 prealpha tests on cheyenne
Test baseline: cesm2_0_alpha07c
Test namelist changes:
Test status: bit for bit

Fixes
User interface changes?:

Update gh-pages html (Y/N)?:

Code review: RobJ, SteveG.
  • Loading branch information
jedwards4b authored Aug 16, 2017
2 parents a2063d5 + d228297 commit f19d107
Show file tree
Hide file tree
Showing 4 changed files with 176 additions and 590 deletions.
18 changes: 0 additions & 18 deletions cime_config/namelist_definition_drv.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2672,24 +2672,6 @@
</values>
</entry>

<entry id="esmf_logging" modify_via_xml="ESMF_LOGFILE_KIND">
<type>char</type>
<category>ccsm_pes</category>
<group>ccsm_pes</group>
<desc>
Determines what ESMF log files (if any) are generated when
USE_ESMF_LIB is TRUE.
ESMF_LOGKIND_SINGLE: Use a single log file, combining messages from
all of the PETs. Not supported on some platforms.
ESMF_LOGKIND_MULTI: Use multiple log files — one per PET.
ESMF_LOGKIND_NONE: Do not issue messages to a log file.
By default, no ESMF log files are generated.
</desc>
<values>
<value>$ESMF_LOGFILE_KIND</value>
</values>
</entry>

<!-- =========================== -->
<!-- group prof_inparm -->
<!-- in perf_mod.F90 -->
Expand Down
9 changes: 4 additions & 5 deletions main/cime_comp_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ module cime_comp_mod
use seq_comm_mct, only: seq_comm_iamin, seq_comm_name, seq_comm_namelen
use seq_comm_mct, only: seq_comm_init, seq_comm_setnthreads, seq_comm_getnthreads
use seq_comm_mct, only: seq_comm_getinfo => seq_comm_setptrs
use seq_comm_mct, only: seq_comm_petlist

! clock & alarm routines and variables
use seq_timemgr_mod, only: seq_timemgr_type
Expand Down Expand Up @@ -572,10 +571,10 @@ module cime_comp_mod
character(*), parameter :: F0I = "('"//subname//" : ', A, 2i8 )"
character(*), parameter :: F01 = "('"//subname//" : ', A, 2i8, 3x, A )"
character(*), parameter :: F0R = "('"//subname//" : ', A, 2g23.15 )"
character(*), parameter :: FormatA = '(A,": =============== ", A41, " ===============")'
character(*), parameter :: FormatD = '(A,": =============== ", A20,2I8,5x, " ===============")'
character(*), parameter :: FormatR = '(A,": =============== ", A31,F9.3,1x, " ===============")'
character(*), parameter :: FormatQ = '(A,": =============== ", A20,2F10.2,1x," ===============")'
character(*), parameter :: FormatA = '(A,": =============== ", A44, " ===============")'
character(*), parameter :: FormatD = '(A,": =============== ", A20,2I8,8x, " ===============")'
character(*), parameter :: FormatR = '(A,": =============== ", A31,F12.3,1x, " ===============")'
character(*), parameter :: FormatQ = '(A,": =============== ", A20,2F10.2,4x," ===============")'
!===============================================================================
contains
!===============================================================================
Expand Down
1 change: 0 additions & 1 deletion main/component_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ module component_mod
use seq_comm_mct, only: seq_comm_iamin, seq_comm_namelen, num_inst_frc
use seq_comm_mct, only: seq_comm_suffix, seq_comm_name, seq_comm_setnthreads
use seq_comm_mct, only: seq_comm_getinfo => seq_comm_setptrs
use seq_comm_mct, only: seq_comm_petlist
use seq_infodata_mod, only: seq_infodata_putData, seq_infodata_GetData
use seq_infodata_mod, only: seq_infodata_exchange, seq_infodata_type
use seq_diag_mct, only: seq_diag_avect_mct
Expand Down
Loading

0 comments on commit f19d107

Please sign in to comment.