dev/master candidate 2019-04-26 #916
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- There is no source code change in this commit. - The switch to the xanadu version of FMS and coupler moves source code between repositories, and therefore requires new build paths which are wired into the testing scripts. This commit checks out a specific version of the gitlab testing scripts along with a xanadu commit of MOM6-examples (which is on branch xanadu-fms). - Once the dev/gfdl branch of MOM6-examples has been rolled forward to xanadu we will return the commit used for gitlab testing to the HEAD of dev/gfdl.
gitlab: specify MOM6-examples and script commits
|
I tried to get a clean copy of dev-master-candidate-2019-04-26 using the
command:
git clone -b dev-master-candidate-2019-04-26 --recursive
https://github.com/NOAA-GFDL/MOM6-examples.git AJW_XFMS
This seemed to work until I tried to build ice_ocean_SIS2:
ftn -Duse_libMPI -Duse_netCDF -DSPMD -Duse_AM3_physics -D_USE_LEGACY_LAND_
-Duse_LARGEFILE -fpp -Wp,-w -I/opt/cray/netcdf/4.4.1.1/INTEL/15.0/include
-fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -i4 -r8 -nowarn -sox
-traceback -O2 -debug minimal -fp-model source -msse2
-I../../shared/repro -c -I../../../../src/SIS2/config_src/dynamic
-I../../../../src/MOM6/src/framework -I../../../../src/SIS2/src
../../../../src/SIS2/src/ice_model.F90
../../../../src/SIS2/src/ice_model.F90(63): error #7002: Error in opening
the compiled module file. Check INCLUDE paths. [OCEAN_ALBEDO_MOD]
use ocean_albedo_mod, only : compute_ocean_albedo ! ice sets
ocean surface
----^
../../../../src/SIS2/src/ice_model.F90(64): error #7002: Error in opening
the compiled module file. Check INCLUDE paths. [OCEAN_ROUGH_MOD]
use ocean_rough_mod, only : compute_ocean_roughness ! properties
over water
----^
../../../../src/SIS2/src/ice_model.F90(63): error #6580: Name in only-list
does not exist. [COMPUTE_OCEAN_ALBEDO]
use ocean_albedo_mod, only : compute_ocean_albedo ! ice sets
ocean surface
-----------------------------^
../../../../src/SIS2/src/ice_model.F90(64): error #6580: Name in only-list
does not exist. [COMPUTE_OCEAN_ROUGHNESS]
use ocean_rough_mod, only : compute_ocean_roughness ! properties
over water
-----------------------------^
compilation aborted for ../../../../src/SIS2/src/ice_model.F90 (code 1)
The above are presumably in the ice_param repository, which I don't seem to
have.
…On Fri, Apr 26, 2019 at 3:43 PM Alistair Adcroft ***@***.***> wrote:
This is a PR onto dev/master of MOM6 and MOM6-examples but has no source
code changes for MOM6. The PR pertains to the use of xanadu versions of FMS
and the GFDL coupler and primarily affects your super-repositories.
- All that changes for MOM6 are the versions of testings scripts used
on Travis-CI and gitlab. This is because some source code has moved between
repositories and those paths are reflected in the testing scripts.
- The latest versions of MOM6 and SIS2 can work with either the warsaw
or xanadu versions of FMS, but there will be additional simplifications to
MOM6 in coming weeks that depend on the FMS code being updated to xanadu.
- xanadu adds new APIs between/for ice and ocean components. The old
APIs still exist but building the xanadu version of the GFDL coupler or FMS
requires newer versions of other components.
- If you are not using https://github.com/NOAA-GFDL/coupler then
you should be able to roll forward to xanadu FMS and latest versions of
SIS2 and MOM6 without further ado.
- If you are using either the GFDL coupler or SIS2 in addition to
MOM6 then you will need to figure out how to use the xanadu versions of FMS
and GFDL coupler.
- MOM6-examples/src/ice_ocean_extras has been removed:
- A new submodule/repository https://github.com/NOAA-GFDL/ice_param
now exists for the albedo code.
- New directories within FMS provide diag_integral and
monin_obukhov code.
- The specific commits for submodules in MOM6-examples/src/ become:
- 3cde6bb src/FMS (xanadu)
- 14578f0 src/coupler (xanadu)
- d9bf834 src/SIS2 (current HEAD
of dev/master and dev/gfdl)
- b114a809187317909e19fdca7ff843f2a603f011 src/icebergs (current
HEAD of dev/master and dev/gfdl)
- aeac506b910c06ce949fea408c2968c0a928a62e src/atmos_null
(xanadu_esm4_20190304)
- 49b089ea8d5b963ede276660cb63c6c3ec2516ab src/land_null
(xanadu_esm4_20190304)
- bf6e4fca190d809e8fb6e7b9be9fb68e47cfdc06 src/ice_param (xanadu)
- The submodules in MOM6-examples/src/ (above) define everything
needed for ocean_only and ice_ocean_SIS2 experiments.
The following pertains to legacy and fully-coupled experiments that can
only be built within the GFDL firewall. Namely the experiments in
ice_ocean_SIS/, land_ice_ocean_LM3_SIS2/, coupled_AM2_LM3_SIS/, or
coupled_AM2_LM3_SIS2/. These require the following repositories:
- 8628c352367dd889833df1480a582bc5652ff0da sis1 (xanadu)
- b59c0450b5d1219a7d10c029354d16917884b26e atmos_param_am3
(warsaw_201803)
- 3be6ed406de2db29766746a69115fd6a47048692 atmos_drivers
(warsaw_201803)
- 75be30e6977582f011d0460e75cc7c59d56a3afc atmos_fv_dynamics
(warsaw_201803)
- 357aed1a76a7d7fec8cdcf80b62e9820974a7e45 atmos_shared_am3
(warsaw_201803)
- 25c6bc861631176f6e363c5a7bee4e8d30b73815 land_lad2 (verona_201701)
- 80ce1b59e29b0b775fce46e90e723bc07993795e land_param (xanadu)
------------------------------
You can view, comment on, or merge this pull request online at:
https://github.com/NOAA-GFDL/MOM6/pull/916
Commit Summary
- gitlab: specify MOM6-examples and script commits
- Merge pull request #915 from adcroft/xanadu-fms
File Changes
- *M* .gitlab-ci.yml
<https://github.com/NOAA-GFDL/MOM6/pull/916/files#diff-0> (5)
Patch Links:
- https://github.com/NOAA-GFDL/MOM6/pull/916.patch
- https://github.com/NOAA-GFDL/MOM6/pull/916.diff
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<https://github.com/NOAA-GFDL/MOM6/pull/916>, or mute the thread
<https://github.com/notifications/unsubscribe-auth/AHBPTUM2CJDDETX3VGT3IXDPSNLP3ANCNFSM4HIZ3HDQ>
.
|
|
I found my problem. I have src/ice_param but it was not in the
mkmf/bin/list_paths command's arguments. The wiki needs updating once this
is the default.
On Mon, May 6, 2019 at 2:57 PM Alan Wallcraft <awallcraft@coaps.fsu.edu>
wrote:
… I tried to get a clean copy of dev-master-candidate-2019-04-26 using the
command:
git clone -b dev-master-candidate-2019-04-26 --recursive
https://github.com/NOAA-GFDL/MOM6-examples.git AJW_XFMS
This seemed to work until I tried to build ice_ocean_SIS2:
ftn -Duse_libMPI -Duse_netCDF -DSPMD -Duse_AM3_physics -D_USE_LEGACY_LAND_
-Duse_LARGEFILE -fpp -Wp,-w -I/opt/cray/netcdf/4.4.1.1/INTEL/15.0/include
-fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -i4 -r8 -nowarn -sox
-traceback -O2 -debug minimal -fp-model source -msse2
-I../../shared/repro -c -I../../../../src/SIS2/config_src/dynamic
-I../../../../src/MOM6/src/framework -I../../../../src/SIS2/src
../../../../src/SIS2/src/ice_model.F90
../../../../src/SIS2/src/ice_model.F90(63): error #7002: Error in opening
the compiled module file. Check INCLUDE paths. [OCEAN_ALBEDO_MOD]
use ocean_albedo_mod, only : compute_ocean_albedo ! ice sets
ocean surface
----^
../../../../src/SIS2/src/ice_model.F90(64): error #7002: Error in opening
the compiled module file. Check INCLUDE paths. [OCEAN_ROUGH_MOD]
use ocean_rough_mod, only : compute_ocean_roughness ! properties
over water
----^
../../../../src/SIS2/src/ice_model.F90(63): error #6580: Name in only-list
does not exist. [COMPUTE_OCEAN_ALBEDO]
use ocean_albedo_mod, only : compute_ocean_albedo ! ice sets
ocean surface
-----------------------------^
../../../../src/SIS2/src/ice_model.F90(64): error #6580: Name in only-list
does not exist. [COMPUTE_OCEAN_ROUGHNESS]
use ocean_rough_mod, only : compute_ocean_roughness ! properties
over water
-----------------------------^
compilation aborted for ../../../../src/SIS2/src/ice_model.F90 (code 1)
The above are presumably in the ice_param repository, which I don't seem
to have.
On Fri, Apr 26, 2019 at 3:43 PM Alistair Adcroft ***@***.***>
wrote:
> This is a PR onto dev/master of MOM6 and MOM6-examples but has no source
> code changes for MOM6. The PR pertains to the use of xanadu versions of FMS
> and the GFDL coupler and primarily affects your super-repositories.
>
> - All that changes for MOM6 are the versions of testings scripts used
> on Travis-CI and gitlab. This is because some source code has moved between
> repositories and those paths are reflected in the testing scripts.
> - The latest versions of MOM6 and SIS2 can work with either the
> warsaw or xanadu versions of FMS, but there will be additional
> simplifications to MOM6 in coming weeks that depend on the FMS code being
> updated to xanadu.
> - xanadu adds new APIs between/for ice and ocean components. The old
> APIs still exist but building the xanadu version of the GFDL coupler or FMS
> requires newer versions of other components.
> - If you are not using https://github.com/NOAA-GFDL/coupler then
> you should be able to roll forward to xanadu FMS and latest versions of
> SIS2 and MOM6 without further ado.
> - If you are using either the GFDL coupler or SIS2 in addition to
> MOM6 then you will need to figure out how to use the xanadu versions of FMS
> and GFDL coupler.
> - MOM6-examples/src/ice_ocean_extras has been removed:
> - A new submodule/repository https://github.com/NOAA-GFDL/ice_param
> now exists for the albedo code.
> - New directories within FMS provide diag_integral and
> monin_obukhov code.
> - The specific commits for submodules in MOM6-examples/src/ become:
> - 3cde6bb src/FMS (xanadu)
> - 14578f0 src/coupler (xanadu)
> - d9bf834 src/SIS2 (current HEAD
> of dev/master and dev/gfdl)
> - b114a809187317909e19fdca7ff843f2a603f011 src/icebergs (current
> HEAD of dev/master and dev/gfdl)
> - aeac506b910c06ce949fea408c2968c0a928a62e src/atmos_null
> (xanadu_esm4_20190304)
> - 49b089ea8d5b963ede276660cb63c6c3ec2516ab src/land_null
> (xanadu_esm4_20190304)
> - bf6e4fca190d809e8fb6e7b9be9fb68e47cfdc06 src/ice_param (xanadu)
> - The submodules in MOM6-examples/src/ (above) define everything
> needed for ocean_only and ice_ocean_SIS2 experiments.
>
> The following pertains to legacy and fully-coupled experiments that can
> only be built within the GFDL firewall. Namely the experiments in
> ice_ocean_SIS/, land_ice_ocean_LM3_SIS2/, coupled_AM2_LM3_SIS/, or
> coupled_AM2_LM3_SIS2/. These require the following repositories:
>
> - 8628c352367dd889833df1480a582bc5652ff0da sis1 (xanadu)
> - b59c0450b5d1219a7d10c029354d16917884b26e atmos_param_am3
> (warsaw_201803)
> - 3be6ed406de2db29766746a69115fd6a47048692 atmos_drivers
> (warsaw_201803)
> - 75be30e6977582f011d0460e75cc7c59d56a3afc atmos_fv_dynamics
> (warsaw_201803)
> - 357aed1a76a7d7fec8cdcf80b62e9820974a7e45 atmos_shared_am3
> (warsaw_201803)
> - 25c6bc861631176f6e363c5a7bee4e8d30b73815 land_lad2 (verona_201701)
> - 80ce1b59e29b0b775fce46e90e723bc07993795e land_param (xanadu)
>
> ------------------------------
> You can view, comment on, or merge this pull request online at:
>
> https://github.com/NOAA-GFDL/MOM6/pull/916
> Commit Summary
>
> - gitlab: specify MOM6-examples and script commits
> - Merge pull request #915 from adcroft/xanadu-fms
>
> File Changes
>
> - *M* .gitlab-ci.yml
> <https://github.com/NOAA-GFDL/MOM6/pull/916/files#diff-0> (5)
>
> Patch Links:
>
> - https://github.com/NOAA-GFDL/MOM6/pull/916.patch
> - https://github.com/NOAA-GFDL/MOM6/pull/916.diff
>
> —
> You are receiving this because you are subscribed to this thread.
> Reply to this email directly, view it on GitHub
> <https://github.com/NOAA-GFDL/MOM6/pull/916>, or mute the thread
> <https://github.com/notifications/unsubscribe-auth/AHBPTUM2CJDDETX3VGT3IXDPSNLP3ANCNFSM4HIZ3HDQ>
> .
>
|
|
Good to know. @marshallward recently updated the wiki to reflect these changes but it must have slipped through the net. |
|
Sorry about that @awallcraft, I had updated the GFDL-specific model instructions but forgot about the general build page. I've replaced |
|
Switching to Xanadu does not change our answers. We approve this PR. |
|
I cann't find sis1, atmos_param_am3, atmos_drivers, atmos_fv_dynamics, atmos_shared_am3, land_lad2, and land_param in GitHub. Have they been removed from GitHub. |
|
@CRLiangCR We only have the means to provide ocean-only and ice-ocean configurations in the MOM6 project. sis1, etc were never on GitHub that I know of. When we used these source codes we used them only on internal servers. For some time now we've been using SIS2 and other codes which ARE on GitHub and are linked to within https://github.com/NOAA-GFDL/MOM6-examples/tree/main/src. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a PR onto dev/master of MOM6 and MOM6-examples but has no source code changes for MOM6. The PR pertains to the use of xanadu versions of FMS and the GFDL coupler and primarily affects your super-repositories.
The following pertains to legacy and fully-coupled experiments that can only be built within the GFDL firewall. Namely the experiments in ice_ocean_SIS/, land_ice_ocean_LM3_SIS2/, coupled_AM2_LM3_SIS/, or coupled_AM2_LM3_SIS2/. These require the following repositories: