Skip to content

mm5 sfclay adding 'defined(mpas)' to call to SFCLAY1D#807

Merged
kkeene44 merged 1 commit intowrf-model:developfrom
kkeene44:mm5_mpas_wrf_unify_update
Mar 13, 2019
Merged

mm5 sfclay adding 'defined(mpas)' to call to SFCLAY1D#807
kkeene44 merged 1 commit intowrf-model:developfrom
kkeene44:mm5_mpas_wrf_unify_update

Conversation

@kkeene44
Copy link
Copy Markdown
Collaborator

@kkeene44 kkeene44 commented Mar 12, 2019

TYPE: no impact

KEYWORDS: mm5, Monin-Obukhov, sfclay, mpas, wrf, SFCLAY1D

SOURCE: internal

DESCRIPTION OF CHANGES: When mods were made to unify wrf/mpas code, MPAS was left out of an if statement within the call to SFCLAY1D. Added it in to correct for MPAS purpose.

LIST OF MODIFIED FILES:
M phys/module_sf_sfclay.F

TESTS CONDUCTED:

  1. Verified that it compiles and runs give bit-for-bit results before and after mods.

  2. Simple test: does this CPP directive do what we want.
    Source code

> cat foo.F
program foo
#if ( ( EM_CORE == 1 ) || ( defined(mpas) ) )
print *,'yep on EM_CORE == 1 || defined mpas'
#else
print *,'Nothing special at all'
#endif
end
  • Works for WRF
> cpp -DEM_CORE=1 foo.F > foo.f90 ; gfortran foo.f90  ; a.out
 yep on EM_CORE == 1 || defined mpas
  • Work for MPAS
> cpp -Dmpas foo.F > foo.f90 ; gfortran foo.f90 ; a.out
 yep on EM_CORE == 1 || defined mpas
  • Expected null result
> cpp -DABC foo.F > foo.f90 ; gfortran foo.f90 ; a.out
 Nothing special at all

@davegill davegill changed the base branch from master to develop March 12, 2019 23:41
Copy link
Copy Markdown
Contributor

@davegill davegill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@kkeene44 kkeene44 merged commit 08ddeb7 into wrf-model:develop Mar 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants