Skip to content

Commit

Permalink
Update ufs-weather for latest CICE emc/develop; Update to esmf-bs47; …
Browse files Browse the repository at this point in the history 
…add export of openwater_frac_in_atm from fv3ATM when coupled (NOAA-EMC#475)


* update CICE in ufs-weather for the latest emc/develop
* fix ice_in_template; sw_redist has been moved to shortwave_nml and removed two unused settings
* update fv3ATM to use esmf-bs47 and add the export of open-water fraction from fv3ATM 
* update module files to use bs47 (PR NOAA-EMC#493)
* fix wcoss-cray for alt-compare functionality
* update CMEPS and NEMS for added export field
* update Dockerfile
  • Loading branch information
@DeniseWorthen
DeniseWorthen authored Apr 5, 2021
1 parent f89f5be commit b8ed338
Show file tree
Hide file tree
Showing 37 changed files with 3,326 additions and 3,445 deletions.
2 changes: 1 addition & 1 deletion CICE-interface/CICE
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
Submodule CMEPS updated 1 files
+31 −26 mediator/fd_nems.yaml
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 4 files
+14 −0 atmos_model.F90
+20 −24 cpl/module_cap_cpl.F90
+6 −5 cpl/module_cplfields.F90
+23 −27 fv3_cap.F90
2 changes: 1 addition & 1 deletion NEMS
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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

0 comments on commit b8ed338

Please sign in to comment.