Skip to content

Update ufs-weather for latest CICE emc/develop; Update to esmf-bs47; add export of openwater_frac_in_atm from fv3ATM when coupled #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeniseWorthen merged 83 commits into from
Apr 5, 2021
Merged

Update ufs-weather for latest CICE emc/develop; Update to esmf-bs47; add export of openwater_frac_in_atm from fv3ATM when coupled #475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
ca288f4
update cmeps
DeniseWorthen Oct 28, 2020
a21c7e9
fix for debug mode compile
DeniseWorthen Oct 28, 2020
0b655ed
update cmeps
DeniseWorthen Oct 29, 2020
1699be7
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Oct 30, 2020
399d21d
point to updcice branch
DeniseWorthen Oct 30, 2020
06bad08
updates for ice_dyn_vp
DeniseWorthen Oct 30, 2020
5d51334
update to last CMEPS master prior to perf updates
DeniseWorthen Nov 1, 2020
21543a2
update CMEPS submodule
DeniseWorthen Nov 2, 2020
2017af3
Merge branch 'develop' into feature/updcmeps
DeniseWorthen Nov 3, 2020
b558028
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 3, 2020
394c7ad
Merge branch 'feature/updcmeps' into feature/updcice
DeniseWorthen Nov 3, 2020
5d19c0f
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 9, 2020
2d12b93
update cice branch of ufs-weather
DeniseWorthen Nov 9, 2020
0e2cc16
update gitmodules and CICE
DeniseWorthen Nov 10, 2020
e4af1ec
set n_aero to zero
DeniseWorthen Nov 10, 2020
a356d4c
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 16, 2020
0564cdf
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 18, 2020
381142b
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 20, 2020
42fe791
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 25, 2020
c73dcd9
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 25, 2020
d320bd5
Merge branch 'develop' into feature/updcice
DeniseWorthen Nov 30, 2020
81b7165
Merge branch 'develop' into feature/updcice
DeniseWorthen Dec 2, 2020
e93cfae
Merge branch 'develop' into feature/updcice skip-ci
DeniseWorthen Dec 4, 2020
ab1ca9f
add cheyenne.intel for ufs-cpld and ufs-datm skip-ci
DeniseWorthen Dec 4, 2020
541c714
rt.sh separate input (#2)
DusanJovic-NOAA Dec 4, 2020
8950d96
add hera gnu logs; update baseline date; skip-ci
DeniseWorthen Dec 4, 2020
b3d2cf2
add orion.intel logs; skip-ci
DeniseWorthen Dec 4, 2020
79205a6
add hera.intel log; skip-ci
DeniseWorthen Dec 4, 2020
d8d1d1d
add wcoss-cray log; skip-ci
DeniseWorthen Dec 4, 2020
6c760ac
add dell-p3 log; skip-ci
DeniseWorthen Dec 5, 2020
526b951
add 'run' for ufs-cpld and ufs-datm on cheyenne.intel
DeniseWorthen Dec 5, 2020
d117a68
Regression test logs for jet.intel and gaea.intel based on commit 6c7…
climbfuji Dec 6, 2020
b3e4ff0
add cheyenne gnu logs; skip-ci
DeniseWorthen Dec 6, 2020
ab613e9
remove cpld and datm for cheyenne.intel
DeniseWorthen Dec 7, 2020
f040511
add cheyenne.intel logs; skip-ci
DeniseWorthen Dec 7, 2020
f798164
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 14, 2021
bae780c
update CICE
DeniseWorthen Mar 14, 2021
1a7774a
Merge branch 'develop' into feature/updcice; skip-ci
DeniseWorthen Mar 16, 2021
883eb55
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 18, 2021
bed13ee
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 21, 2021
86e8105
fix ice_in_template namelist
DeniseWorthen Mar 22, 2021
143f558
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 24, 2021
08e120f
create branch for update to esmf bs47
DeniseWorthen Mar 25, 2021
89003ac
update modulefiles on dell-p3 for bs47
DeniseWorthen Mar 25, 2021
80b152c
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 27, 2021
e342eb6
update FV3
DeniseWorthen Mar 27, 2021
2ceae1b
Merge branch 'develop' into feature/testbs47
DeniseWorthen Mar 27, 2021
7b826d4
update FV3
DeniseWorthen Mar 27, 2021
cea6fc6
update hera.intel modulefiles for testing
DeniseWorthen Mar 27, 2021
071275b
Revert "update hera.intel modulefiles for testing"
DeniseWorthen Mar 27, 2021
4db2ff2
Revert "update FV3"
DeniseWorthen Mar 27, 2021
aa94884
update hera module files for bs47
DeniseWorthen Mar 27, 2021
712960a
hera test logs for bs47
DeniseWorthen Mar 27, 2021
7eed868
failed tests on dell-p3; two compile jobs fail
DeniseWorthen Mar 28, 2021
194a3f1
Merge branch 'feature/testbs47' of https://github.com/DeniseWorthen/u…
DeniseWorthen Mar 28, 2021
6b2a64a
update wcoss-cray esmf
DeniseWorthen Mar 29, 2021
b45157a
update esmf version on additional platforms
DeniseWorthen Mar 29, 2021
ebc201e
update FV3
DeniseWorthen Mar 30, 2021
501fe20
update CMEPS
DeniseWorthen Mar 30, 2021
5a8d4b6
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 30, 2021
afce9f4
Merge branch 'develop' into feature/testbs47
DeniseWorthen Mar 30, 2021
5323ebf
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 30, 2021
f6f874e
correct location for updated esmf build
DeniseWorthen Mar 30, 2021
4f4899c
Merge branch 'feature/testbs47' into feature/updcice
DeniseWorthen Mar 31, 2021
83d03e0
fix wcoss-cray for alt-compare functionality
DeniseWorthen Mar 31, 2021
09716fe
Merge remote-tracking branch 'upstream/develop' into develop
DeniseWorthen Mar 31, 2021
ec46d3e
Merge branch 'develop' into feature/updcice
DeniseWorthen Mar 31, 2021
e817214
update NEMS for added field in Dictionary
DeniseWorthen Apr 1, 2021
33929f7
update gnu module files for bs47; update baseline date
DeniseWorthen Apr 1, 2021
eb69acf
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Apr 1, 2021
eccd9f9
comment out regional_quilt test and increase wall clock time
DeniseWorthen Apr 1, 2021
d2e1ed0
add cheyenne.gnu log
DeniseWorthen Apr 1, 2021
b70f53a
add wcoss-cray log
DeniseWorthen Apr 1, 2021
8e3751f
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Apr 1, 2021
1b8b137
add cheyenne intel log
DeniseWorthen Apr 1, 2021
a1371df
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Apr 2, 2021
c6df91f
add orion.intell log
DeniseWorthen Apr 2, 2021
bcd7d14
add dell_p3 log
DeniseWorthen Apr 2, 2021
50c1999
add jet.intel log
DeniseWorthen Apr 3, 2021
343da16
update submodules
DeniseWorthen Apr 5, 2021
446da5b
update FV3 submodule
DeniseWorthen Apr 5, 2021
5bdae36
update Dockerfile
DeniseWorthen Apr 5, 2021
d067cc4
run-ci
DeniseWorthen Apr 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Open in desktop
Submodule CICE updated 86 files
+135 −0 .github/workflows/test-cice.yml
+10 −0 .github/workflows/write_logfiles.csh
+5 −1 .travis.yml
+ − LICENSE.pdf
+2 −1 README.md
+11 −4 cicecore/cicedynB/analysis/ice_diagnostics.F90
+2 −2 cicecore/cicedynB/analysis/ice_history.F90
+30 −16 cicecore/cicedynB/analysis/ice_history_bgc.F90
+11 −2 cicecore/cicedynB/analysis/ice_history_mechred.F90
+11 −2 cicecore/cicedynB/analysis/ice_history_pond.F90
+23 −8 cicecore/cicedynB/dynamics/ice_dyn_eap.F90
+25 −10 cicecore/cicedynB/dynamics/ice_dyn_evp.F90
+5 −5 cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
+221 −41 cicecore/cicedynB/dynamics/ice_dyn_shared.F90
+29 −15 cicecore/cicedynB/dynamics/ice_dyn_vp.F90
+68 −74 cicecore/cicedynB/dynamics/ice_transport_driver.F90
+8 −8 cicecore/cicedynB/general/ice_flux.F90
+127 −117 cicecore/cicedynB/general/ice_forcing.F90
+623 −612 cicecore/cicedynB/general/ice_init.F90
+10 −13 cicecore/cicedynB/general/ice_step_mod.F90
+0 −18 cicecore/cicedynB/infrastructure/comm/mpi/ice_communicate.F90
+9 −9 cicecore/cicedynB/infrastructure/ice_grid.F90
+2 −2 cicecore/drivers/direct/hadgem3/CICE.F90
+1 −1 cicecore/drivers/direct/hadgem3/CICE_InitMod.F90
+2 −2 cicecore/drivers/mct/cesm1/CICE_copyright.txt
+2 −2 cicecore/drivers/nuopc/cmeps/CICE_copyright.txt
+2 −2 cicecore/drivers/nuopc/dmi/CICE.F90
+2 −2 cicecore/drivers/standalone/cice/CICE.F90
+1 −1 cicecore/drivers/standalone/cice/CICE_RunMod.F90
+9 −8 cicecore/drivers/standalone/cice/CICE_RunMod.F90_debug
+1 −1 cicecore/version.txt
+9 −1 configuration/scripts/cice.batch.csh
+12 −0 configuration/scripts/cice.launch.csh
+10 −7 configuration/scripts/ice_in
+40 −0 configuration/scripts/machines/Macros.freya_gnu
+69 −0 configuration/scripts/machines/Macros.freya_intel
+39 −0 configuration/scripts/machines/env.freya_gnu
+38 −0 configuration/scripts/machines/env.freya_intel
+0 −0 configuration/scripts/options/set_env.box2001
+3 −1 configuration/scripts/options/set_nml.alt01
+1 −1 configuration/scripts/options/set_nml.alt03
+1 −1 configuration/scripts/options/set_nml.alt04
+0 −0 configuration/scripts/options/set_nml.box2001
+1 −1 configuration/scripts/options/set_nml.boxrestore
+0 −0 configuration/scripts/options/set_nml.gbox80
+7 −6 configuration/scripts/options/set_nml.gx1
+9 −0 configuration/scripts/options/set_nml.gx1coreii
+8 −5 configuration/scripts/options/set_nml.gx3
+9 −0 configuration/scripts/options/set_nml.gx3ncarbulk
+0 −17 configuration/scripts/options/set_nml.jra55
+0 −17 configuration/scripts/options/set_nml.jra55_2008
+0 −17 configuration/scripts/options/set_nml.jra55_gx1
+0 −17 configuration/scripts/options/set_nml.jra55_gx1_2008
+0 −17 configuration/scripts/options/set_nml.jra55_gx3
+0 −17 configuration/scripts/options/set_nml.jra55_gx3_2008
+1 −0 configuration/scripts/options/set_nml.kevp102
+3 −0 configuration/scripts/options/set_nml.yi2008
+9 −0 configuration/scripts/options/set_nml.zsal
+14 −9 configuration/scripts/tests/base_suite.ts
+1 −1 configuration/scripts/tests/decomp_suite.ts
+3 −3 configuration/scripts/tests/first_suite.ts
+11 −10 configuration/scripts/tests/io_suite.ts
+0 −1 configuration/scripts/tests/nothread_quicksuite.ts
+6 −6 configuration/scripts/tests/nothread_suite.ts
+2 −2 configuration/scripts/tests/quick_suite.ts
+4 −4 configuration/scripts/tests/reprosum_suite.ts
+8 −2 configuration/scripts/tests/test_decomp.script
+2 −2 configuration/scripts/tests/travis_suite.ts
+5 −3 configuration/scripts/timeseries.csh
+4 −3 configuration/scripts/timeseries.py
+1 −1 doc/requirements.txt
+3 −1 doc/source/cice_index.rst
+3 −3 doc/source/conf.py
+3 −3 doc/source/developer_guide/dg_dynamics.rst
+217 −0 doc/source/developer_guide/dg_forcing.rst
+ − doc/source/developer_guide/figures/jra55data.png
+1 −0 doc/source/developer_guide/index.rst
+1 −1 doc/source/intro/copyright.rst
+6 −4 doc/source/intro/quickstart.rst
+9 −0 doc/source/master_list.bib
+85 −12 doc/source/science_guide/sg_dynamics.rst
+1 −1 doc/source/science_guide/sg_horiztrans.rst
+11 −12 doc/source/user_guide/ug_case_settings.rst
+48 −6 doc/source/user_guide/ug_running.rst
+1 −1 doc/source/user_guide/ug_testing.rst
+1 −1 icepack
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Open in desktop
Submodule CMEPS updated 1 files
+31 −26 mediator/fd_nems.yaml
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from ebccc5 to c20646
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 1 files
+11 −0 src/module_EARTH_GRID_COMP.F90
2 changes: 1 addition & 1 deletion modulefiles/cheyenne.gnu/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/cheyenne.gnu/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/cheyenne.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/cheyenne.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/gaea.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/gaea.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/hera.gnu/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ setenv CMAKE_Platform hera.gnu
module use /scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/modulefiles/stack
module load hpc/1.1.0
module load hpc-gnu/9.2.0
module load hpc-mpich/3.3.2
module load hpc-mpich/3.3.2
module load mpich/3.3.2

module load jasper/2.0.22
Expand All @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/hera.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/hera.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/jet.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/jet.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/orion.intel/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/orion.intel/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/wcoss_cray/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ module load gni-headers
module load udreg
module load ugni

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.1.0bs27
module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0
module load esmf/810bs47

module swap pmi pmi/5.0.11

Expand Down
5 changes: 2 additions & 3 deletions modulefiles/wcoss_cray/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ module load gni-headers
module load udreg
module load ugni

module use /gpfs/hps3/emc/nems/noscrub/emc.nemspara/soft/modulefiles
module load esmf/8.1.0bs27

module use /gpfs/hps/usrx/local/nceplibs/NCEPLIBS/cmake/install/NCEPLIBS-v1.3.0
module load esmf/810bs47-debug
module swap pmi pmi/5.0.11

##
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/wcoss_dell_p3/fv3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27
module load esmf/8_1_0_beta_snapshot_47

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/wcoss_dell_p3/fv3_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module load png/1.6.35
module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.1
module load esmf/8_1_0_beta_snapshot_27-debug
module load esmf/8_1_0_beta_snapshot_47-debug

module load bacio/2.4.1
module load crtm/2.3.0
Expand Down
Loading