Skip to content

Commit

Permalink
Merge pull request ESCOMP#322 from jedwards4b/LL_fldList
Browse files Browse the repository at this point in the history
### Description of changes
Make the med_fldList fields a linked list instead of an array.   This avoids a lot of small allocations and memory fragmentation.  

### Specific notes

Contributors other than yourself, if any: Denise 

CMEPS Issues Fixed: ESCOMP#321 

Are changes expected to change answers? bfb

Any User Interface Changes (namelist or namelist defaults changes)?

### Testing performed

Testing performed if application target is CESM:
- [X] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
   - machines: cheyenne, intel
   - details (e.g. failed tests):  all pass
- [ ] (recommended) CESM testlist_drv.xml
   - machines and compilers:
   - details (e.g. failed tests):
- [X] (optional) CESM prealpha test 
   - machines and compilers cheyenne, intel 
   - details (e.g. failed tests):  All pass except expected fails of cesm2_3_alpha10c
- [ ] (other) please described in detail
   - machines and compilers
   - details (e.g. failed tests):

Testing performed if application target is UFS-coupled:
- [X] (recommended) UFS-coupled testing
   - description: gnu and intel
   - details (e.g. failed tests):

Testing performed if application target is UFS-HAFS:
- [ ] (recommended) UFS-HAFS testing
   - description:
   - details (e.g. failed tests):

### Hashes used for testing:

- [ ] CESM:
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - branch/hash:
- [ ] UFS-coupled, then umbrella repostiory to check out and associated hash:
  - repository to check out:
  - branch/hash:
- [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash:
  - repository to check out:
  - branch/hash:
  • Loading branch information
jedwards4b authored Nov 30, 2022
2 parents ce1305c + b8c29e6 commit ae5cfcd
Show file tree
Hide file tree
Showing 19 changed files with 1,827 additions and 1,622 deletions.
5 changes: 3 additions & 2 deletions cesm/driver/util.F90
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ module util
! CustomFieldDictionaryProto utility module
!-----------------------------------------------------------------------------

use ESMF
use NUOPC
use ESMF, only : ESMF_SUCCESS, ESMF_MAXSTR, ESMF_IOFmt_flag, ESMF_LogWrite
use ESMF, only : ESMF_LOGMSG_INFO, ESMF_LOGERR_PASSTHRU, ESMF_LOGFoundError
use NUOPC, only : nuopc_freeFormat, nuopc_freeformatLog, nuopc_fieldDictionaryEgest

implicit none

Expand Down
5 changes: 2 additions & 3 deletions cesm/nuopc_cap_share/nuopc_shr_methods.F90
Original file line number Diff line number Diff line change
Expand Up @@ -149,8 +149,6 @@ subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)

rc = ESMF_SUCCESS

shrlogunit = 6

if (mastertask) then
call NUOPC_CompAttributeGet(gcomp, name="diro", value=diro, rc=rc)
if (chkerr(rc,__LINE__,u_FILE_u)) return
Expand All @@ -170,7 +168,8 @@ subroutine set_component_logging(gcomp, mastertask, logunit, shrlogunit, rc)
else
logUnit = 6
endif
! TODO: shr_file mod is deprecated and should be removed.
shrlogunit = logunit

call shr_file_setLogUnit (logunit)

end subroutine set_component_logging
Expand Down
2 changes: 2 additions & 0 deletions cime_config/buildexe
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ def _main_func():

rc, out, err = run_cmd(cmd,from_dir=bld_root)
expect(rc==0,"Command {} failed rc={}\nout={}\nerr={}".format(cmd,rc,out,err))
if err:
logger.info(err)
logger.info(out)

###############################################################################
Expand Down
Loading

0 comments on commit ae5cfcd

Please sign in to comment.