Skip to content

Commit

Permalink
Merge pull request #176 from mvertens/bugfix/single_column
Browse files Browse the repository at this point in the history
### Description of changes
Fix setting of scol_spval for single column functionality 

### Specific notes
This is a simple fix for CESM single column functionality. This ONLY effects the CESM NUOPC driver code.

Contributors other than yourself, if any:

CMEPS Issues Fixed: None

Are changes expected to change answers?
 - [x] bit for bit
 - [ ] different at roundoff level
 - [ ] more substantial 

Any User Interface Changes (namelist or namelist defaults changes)?
 - [ ] Yes
 - [x] No

Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required):
    validated that SMS_D_Ln9_Vnuopc.T42_T42.FSCAM.cheyenne_intel.cam-scam_mpace_outfrq9s now works using cesm2_3_alpah02d hash

Hashes used for testing:
- [ ] CESM:
  - repository to check out: https://github.com/ESCOMP/CESM.git
  - hash: tag for cesm2_3_alpah02d
  • Loading branch information
jedwards4b authored Apr 21, 2021
2 parents 448a81c + b4a304f commit 75b8d75
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/cime/esm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1266,6 +1266,8 @@ subroutine esm_set_single_column_attributes(compname, gcomp, rc)
read(cvalue,*) scol_lat
call NUOPC_CompAttributeGet(gcomp, name='single_column_lnd_domainfile', value=single_column_lnd_domainfile, rc=rc)
if (ChkErr(rc,__LINE__,u_FILE_u)) return
call NUOPC_CompAttributeAdd(gcomp, attrList=(/'scol_spval'/), rc=rc)
if (chkerr(rc,__LINE__,u_FILE_u)) return

if ( (scol_lon < scol_spval .and. scol_lat > scol_spval) .or. &
(scol_lon > scol_spval .and. scol_lat < scol_spval)) then
Expand Down Expand Up @@ -1307,8 +1309,7 @@ subroutine esm_set_single_column_attributes(compname, gcomp, rc)
'scol_lndmask', &
'scol_lndfrac', &
'scol_ocnmask', &
'scol_ocnfrac', &
'scol_spval '/), rc=rc)
'scol_ocnfrac'/), rc=rc)
if (chkerr(rc,__LINE__,u_FILE_u)) return

if (trim(single_column_lnd_domainfile) /= 'UNSET') then
Expand Down

0 comments on commit 75b8d75

Please sign in to comment.