search

NOAA-EMC / NEMS

NEMS (NOAA Environmental Modeling System)
https://noaa-emc.github.io/NEMS_doc/index.html
Other
11 stars 46 forks source link

This commit #refs 67538 (merge gmtb/develop into NOAA-EMC/develop) #7

Closed climbfuji closed 5 years ago

climbfuji commented 5 years ago

This commit #refs 67538, squashed commit of the following:

commit abe9efba450215961cdfc4948f76668ed4833f31 Author: Dom Heinzeller dom.heinzeller@noaa.gov Date: Tue Sep 3 16:25:12 2019 -0600

src/module_MEDIATOR.F90: fix invalid Fortran code for GNU compiler

commit 89ddf135b08e7f7b77d72b4459fe40aa9cc3d361 Author: Dom Heinzeller dom.heinzeller@noaa.gov Date: Wed Aug 28 13:36:52 2019 -0600

src/incmake/env/rdhpcs/detect.mk: bugfix for NEMSCompsetRun

commit 283eeb11bbde78c8e2d761e6e42b6af074655732 Merge: 1c71222c e142f4ef Author: Dom Heinzeller dom.heinzeller@icloud.com Date: Tue Aug 27 15:45:57 2019 -0600

Merge pull request #2 from climbfuji/hera_update_20190827

gmtb/develop: update hera config

commit e142f4ef8cf9ed3104425a1c4f92ff6a14436c43 Author: Dom Heinzeller dom.heinzeller@noaa.gov Date: Tue Aug 27 15:04:16 2019 -0600

src/incmake/env/rdhpcs/detect.mk: test for hostname prefix, since hera and theia both have /scratch1 through /scratch4 mounted

commit 028e1e8c662c52ef999831b0129c7663b7216a19 Author: Dom Heinzeller dom.heinzeller@noaa.gov Date: Tue Aug 27 13:45:29 2019 -0600

Update src/incmake/env/rdhpcs/detect.mk, src/conf/module-setup.csh.inc, src/conf/module-setup.sh.inc after move from Juno test system to Hera. Since /scratch4 from theia is also mounted on hera, need to switch the order of detection.

commit 1c71222cb07c9d6c006cc305050afe193adf5ce4 Merge: 6bf81091 5b244abe Author: Dom Heinzeller dom.heinzeller@icloud.com Date: Sat Aug 17 16:25:57 2019 -0600

Merge pull request #1 from climbfuji/hera_support

Add support for hera/juno (theia successor)

commit 5b244abe31b637c5f5521dddab454a44d49e4f3f Author: Dom Heinzeller dom.heinzeller@noaa.gov Date: Fri Aug 16 09:33:34 2019 -0600

Add support for hera/juno (theia successor)
climbfuji commented 5 years ago

Associated pull requests (GitHub) or code review changes (Vlab/Gerrit):

NEMSfv3gfs: https://vlab.ncep.noaa.gov/code-review/19568 (including update of submodule pointer for WW3) FV3: https://vlab.ncep.noaa.gov/code-review/19567 FV3/atmos_cubed_sphere: https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere/pull/3 NEMS: https://github.com/NOAA-EMC/NEMS/pull/7 (ignore update of submodule pointer for pyprodutil) WW3: no changes FMS: no changes ccpp-physics https://github.com/NCAR/ccpp-physics/pull/317 ccpp-framework https://github.com/NCAR/ccpp-framework/pull/222

climbfuji commented 5 years ago

Sure - do we need those two scripts at all? You didn't make any changes in them, and my versions apparently don't mess up the testing either. Anyway, I think this is the correct syntax? Can you check?

module-setup.sh.inc

if [[ -d /lfs3 ]] ; then
    # We are on NOAA Jet
    if ( ! eval module help > /dev/null 2>&1 ) ; then
        source /apps/lmod/lmod/init/$__ms_shell
    fi
    module purge
elif [[ -d /scratch1 && ! -d /scratch ]] ; then
    # We are on NOAA Hera
    if ( ! eval module help > /dev/null 2>&1 ) ; then
        source /apps/lmod/lmod/init/$__ms_shell
    fi
    module purge
elif [[ -d /scratch3 && -d /scratch ]] ; then
    # We are on NOAA Theia
    if ( ! eval module help > /dev/null 2>&1 ) ; then
        source /apps/lmod/lmod/init/$__ms_shell
    fi
    module purge
...

module-setup.csh.inc

if ( { test -d /lfs3 } ) then 
    # We are on NOAA Jet
    if ( ! { module help >& /dev/null } ) then
            source /apps/lmod/lmod/init/$__ms_shell
    endif
    module purge
else if ( { test -d /scratch1 -a ! -d /scratch } ) then
    # We are on NOAA Hera
    if ( ! { module help >& /dev/null } ) then
        source /apps/lmod/lmod/init/$__ms_shell
    endif
    module purge
else if ( { test -d /scratch3 -a -d /scratch } ) then
    # We are on NOAA Theia
    if ( ! { module help >& /dev/null } ) then
        source /apps/lmod/lmod/init/$__ms_shell
    endif
    module purge
RatkoVasic-NOAA commented 5 years ago 
You are right, we don't need to change anything... they are both
  sourcing same filename at same location.
  Anyway I'm pretty sure your syntax is correct :-)

  So, your choice.. either use this new syntax, or leave files as
  they are (eventually changing comment from Theia to Hera). I vote
  for first option.

  -Ratko

On 9/9/2019 11:31 AM, Dom Heinzeller
  wrote:

  Sure - do we need those two scripts at all? You didn't make any
    changes in them, and my versions apparently don't mess up the
    testing either. Anyway, I think this is the correct syntax? Can
    you check?
  module-setup.sh.inc
  if [[ -d /lfs3 ]] ; then
# We are on NOAA Jet
if ( ! eval module help > /dev/null 2>&1 ) ; then
    source /apps/lmod/lmod/init/$__ms_shell
fi
module purge

elif [[ -d /scratch1 && ! -d /scratch ]] ; then

We are on NOAA Hera

if ( ! eval module help > /dev/null 2>&1 ) ; then
    source /apps/lmod/lmod/init/$__ms_shell
fi
module purge

elif [[ -d /scratch3 && -d /scratch ]] ; then

We are on NOAA Theia

if ( ! eval module help > /dev/null 2>&1 ) ; then
    source /apps/lmod/lmod/init/$__ms_shell
fi
module purge

...

  module-setup.csh.inc
  if ( { test -d /lfs3 } ) then 
# We are on NOAA Jet
if ( ! { module help >& /dev/null } ) then
        source /apps/lmod/lmod/init/$__ms_shell
endif
module purge

else if ( { test -d /scratch1 -a ! -d /scratch } ) then

We are on NOAA Hera

if ( ! { module help >& /dev/null } ) then
    source /apps/lmod/lmod/init/$__ms_shell
endif
module purge

else if ( { test -d /scratch3 -a -d /scratch } ) then

We are on NOAA Theia

if ( ! { module help >& /dev/null } ) then
    source /apps/lmod/lmod/init/$__ms_shell
endif
module purge

  —
    You are receiving this because you commented.
    Reply to this email directly, view it on GitHub, or mute the thread.
  [

{ "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "https://github.com/NOAA-EMC/NEMS/pull/7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "url": "https://github.com/NOAA-EMC/NEMS/pull/7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]

--

Ratko Vasic Meteorologist 301-683-3814 National Oceanic and Atmospheric Administration NCEP/EMC, Room 2791 NCWCP W/NP2 5830 University Research Court College Park, MD 20740-3818

climbfuji commented 5 years ago

You are right, we don't need to change anything... they are both sourcing same filename at same location. Anyway I'm pretty sure your syntax is correct :-) So, your choice.. either use this new syntax, or leave files as they are (eventually changing comment from Theia to Hera). I vote for first option. -Ratko On 9/9/2019 11:31 AM, Dom Heinzeller wrote: Sure - do we need those two scripts at all? You didn't make any changes in them, and my versions apparently don't mess up the testing either. Anyway, I think this is the correct syntax? Can you check? module-setup.sh.inc if [[ -d /lfs3 ]] ; then # We are on NOAA Jet if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$ms_shell fi module purge elif [[ -d /scratch1 && ! -d /scratch ]] ; then # We are on NOAA Hera if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$__ms_shell fi module purge elif [[ -d /scratch3 && -d /scratch ]] ; then # We are on NOAA Theia if ( ! eval module help > /dev/null 2>&1 ) ; then source /apps/lmod/lmod/init/$ms_shell fi module purge ... module-setup.csh.inc if ( { test -d /lfs3 } ) then # We are on NOAA Jet if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$ms_shell endif module purge else if ( { test -d /scratch1 -a ! -d /scratch } ) then # We are on NOAA Hera if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$__ms_shell endif module purge else if ( { test -d /scratch3 -a -d /scratch } ) then # We are on NOAA Theia if ( ! { module help >& /dev/null } ) then source /apps/lmod/lmod/init/$ms_shell endif module purge — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or mute the thread. [ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "#7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "url": "#7?email_source=notifications\u0026email_token=AI63FMSRBGJURQLHS7ZHEDLQIZT6DA5CNFSM4IUWBIJKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOD6IA33I#issuecomment-529534445", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ] …

I agree, let's go for option 1. I tested the new syntax by creating two small shell scripts, one for csh and one for sh, ran them on both theia and hera and got the correct results. I pushed the changes to my branch and the PR should be updated by now.