-
Notifications
You must be signed in to change notification settings - Fork 10
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.
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
Update components and app #14
Merged
+2,853
−779
Merged
Changes from all commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
313c65f
update components
DeniseWorthen 6fd2541
update DATM submodule and build in debug by default
DeniseWorthen 60ca765
update components NEMS and CICE; set aoflux in
DeniseWorthen 83cee30
update for no prep_atm,field dumping w/ timestamps
DeniseWorthen 15f77d2
update NEMS
DeniseWorthen ad08886
update nems
DeniseWorthen 6dbb04e
update DATM
DeniseWorthen c847ddb
update NEMS, conf and modules for cheyenne
DeniseWorthen 41fa461
update DATM
DeniseWorthen 51e6c87
update NEMS
DeniseWorthen b332e76
update NEMS
DeniseWorthen a02530c
update NEMS, DATM and data table
DeniseWorthen f01cf2d
Merge pull request #1 from NOAA-EMC/develop
DeniseWorthen 1e95675
Merge pull request #3 from DeniseWorthen/develop
DeniseWorthen f417611
update NEMS for bs8.1.0bs10
DeniseWorthen 251050f
Merge branch 'feature/debug' of https://github.com/DeniseWorthen/DATM…
DeniseWorthen 0dfe8fd
update CICE_SRC,MOM6
DeniseWorthen cd2d2f8
update DATM submodule; revert moment_flx name change
DeniseWorthen 7d004cb
update DATM and config files
DeniseWorthen d3130b8
initial commit of updated compsets and param
DeniseWorthen 78921af
Delete tmp
DeniseWorthen 3df8d01
update DATM, NEMS, compsets and parm
DeniseWorthen 9e37648
update path to use when generating SCRIP grid files
DeniseWorthen 30deb5c
update DATM, compsets and scrip gen routine
DeniseWorthen c21777f
revert to develop branch of CICE; update NEMS submodule
DeniseWorthen 513f817
update parm and DATM
DeniseWorthen de51737
update submodules for develop branch; add additional
DeniseWorthen 1e00ba1
update submodules; point to bugfix branch of NEMS
DeniseWorthen 7ab313d
update DATM to develop
DeniseWorthen e458414
update CICE submodule
DeniseWorthen 38eb4cc
update NEMS to develop
DeniseWorthen 15a7b3e
fix broken NEMS submodule update
DeniseWorthen 231a3f7
add orion conf and modulefiles
DeniseWorthen aa5f0c5
update compset and hera baseline area
DeniseWorthen 9c65a25
add hera logs
DeniseWorthen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| utilities/gen_scrip/*.skl | ||
| utilities/gen_scrip/*.nc |
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
Submodule CICE_SRC
updated
8 files
| +3 −0 | .gitignore | |
| +92 −0 | lanl_cice/bld/Macros.Linux.NEMS.cheyenne | |
| +8 −2 | lanl_cice/bld/Macros.Linux.NEMS.hera | |
| +90 −0 | lanl_cice/bld/Macros.Linux.NEMS.orion | |
| +12 −0 | lanl_cice/comp_ice.backend | |
| +2 −2 | lanl_cice/source/ice_therm_itd.F90 | |
| +670 −11 | lanl_cice_cap/cice_cap.F90 | |
| +1 −1 | lanl_cice_cap/makefile.nuopc |
Submodule DATM
updated
12 files
| +5 −0 | .gitignore | |
| +3 −1 | DATM/AtmBundleCreate.F90 | |
| +0 −241 | DATM/AtmExportFields.F90 | |
| +94 −154 | DATM/AtmFieldUtils.F90 | |
| +45 −22 | DATM/AtmForce.F90 | |
| +0 −253 | DATM/AtmGridSetUp.F90 | |
| +13 −204 | DATM/AtmGridUtils.F90 | |
| +0 −67 | DATM/AtmImportFields.F90 | |
| +62 −17 | DATM/AtmInternalFields.F90 | |
| +7 −47 | DATM/AtmModel.F90 | |
| +4 −6 | DATM/Makefile | |
| +108 −322 | DATM/datm.F90 |
Submodule MOM6
updated
5 files
| +9 −0 | .gitignore | |
| +1 −1 | clean.sh | |
| +13 −2 | compile.sh | |
| +1 −1 | src/MOM6 | |
| +1 −1 | src/mkmf |
Submodule NEMS
updated
39 files
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,10 @@ | ||
| load 'mom6cice5datm.input' | ||
|
|
||
| run cpld_datm_mom6_cice_cold @ coupled, cold, standard, baseline | ||
| run cpld_datm_mom6_cice_3d @ coupled, warm, standard, baseline | ||
| run cpld_datm_mom6_cice_hot @ coupled, hot, standard, baseline | ||
| ######################################################################## | ||
| #Run the standard Regression tests | ||
|
|
||
| run cpld_datm_mom6_cice5_cold_cfsr @ coupled, cold, standard, baseline | ||
| run cpld_datm_mom6_cice5_cold_gefs @ coupled, cold, standard, baseline | ||
|
|
||
| run cpld_datm_mom6_cice5_2d_cfsr @ coupled, warm, standard, baseline | ||
| run cpld_datm_mom6_cice5_2d_gefs @ coupled, warm, standard, baseline |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| ############################################################################ | ||
| # 2 day run starting on @CDATE | ||
| ############################################################################ | ||
|
|
||
| test cpld_datm_mom6_cice5_2d: datm_mom6_cice.exe { | ||
| use plat | ||
| use plat%default_cpl | ||
| use datm_defaults | ||
|
|
||
| TEST_DESCR="datm-mom6-cice5 - 2 day run" | ||
| CNTL_NAME="RT-Baselines_2d_@[DATM_SRC]" | ||
|
|
||
| COM="@[plat%COMrt]/@[TEST_NAME]" # Test result area | ||
| RUNDIR="@[plat%TMPrt]/@[TEST_NAME]" # Test work area | ||
| CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area | ||
| CNTLMED="@[plat%BASELINE]/MEDIATOR_@[DATM_SRC]" # Control/Mediator area | ||
| BL_INPUTS="@[plat%INPUTS]" | ||
|
|
||
| DAYS='2' | ||
| FHMAX='48' | ||
|
|
||
| # Restart interval, mediator and MOM6 | ||
| RESTART_INTERVAL="86400" | ||
| # CICE | ||
| DUMPFREQ='s' | ||
| DUMPFREQ_N="@[RESTART_INTERVAL]" | ||
|
|
||
| # - set component and coupling timesteps | ||
| DT_CICE="@[DT_ATMOS]" | ||
| CPL_SLOW="@[DT_THERM_MOM6]" | ||
| CPL_FAST="@[DT_ATMOS]" | ||
|
|
||
| build=datm_mom6_cice.exe | ||
|
|
||
| prep=datmprep( | ||
| RUNDIR="@[RUNDIR]", | ||
| modules="@[build%modules.nems]", | ||
| CNTL="@[CNTL]") | ||
|
|
||
| # - set total number of tasks to satisfy coupled application need | ||
| TASKS=280 | ||
|
|
||
| # - nems.configure --- | ||
| nems_configure='med_atm_ocn_ice' | ||
| coupling_interval_slow_sec="@[CPL_SLOW]" | ||
| coupling_interval_fast_sec="@[CPL_FAST]" | ||
|
|
||
| filters input { | ||
| # WORK FILE <=filter= SOURCE FILE | ||
| 'input.nml' <=atparse= "@[PARMnems]/input.mom6.nml.IN" | ||
| 'model_configure' <=atparse= "@[PARMnems]/model_configure.IN" | ||
| 'nems.configure' <=atparse= "@[PARMnems]/nems.configure.@[nems_configure].IN" | ||
| 'INPUT/*' <=copyfrom= "@[BL_INPUTS]/MOM6_FIX_025deg" | ||
| 'data_table' <=copy= "@[PARMnems]/data_table" | ||
| 'datm_data_table' <=copy= "@[PARMnems]/datm_data_table.IN" | ||
| 'DATM_INPUT/*' <=copyfrom= "@[BL_INPUTS]/DATM/@[DATM_SRC]/@[SYEAR]@[SMONTH]" | ||
| 'DATM_INPUT/' <=copy= "@[BL_INPUTS]/DATM/@[FILENAME_BASE]SCRIP.nc" | ||
| 'grid_cice_NEMS_mx025.nc' <=copy= "@[BL_INPUTS]/CICE_FIX_mx025/grid_cice_NEMS_mx025.nc" | ||
| 'kmtu_cice_NEMS_mx025.nc' <=copy= "@[BL_INPUTS]/CICE_FIX_mx025/kmtu_cice_NEMS_mx025.nc" | ||
| 'cice5_model.res.nc' <=copy= "@[BL_INPUTS]/CICE_IC/cice5_model_0.25.@[ICEICSOURCE].res_@[CDATE].nc" | ||
| 'INPUT/*' <=copyfrom= "@[BL_INPUTS]/MOM6_IC/@[CDATE]" | ||
| 'ice_in_template' <=copy= "@[PARMnems]/ice_in_template" | ||
| 'diag_table_template' <=copy= "@[PARMnems]/diag_table_template" | ||
| 'INPUT/MOM_input_template' <=copy= "@[PARMnems]/MOM_input_template" | ||
| '*' <=copyfrom= "@[BL_INPUTS]/MEDIATOR_@[DATM_SRC]" | ||
| } | ||
|
|
||
|
|
||
| # Edit the templates for the compset parameters | ||
| prerun=edit_inputs(CDATE="@[CDATE]", | ||
| DT_CICE="@[DT_CICE]", | ||
| NPROC_ICE="@[NPROC_ICE]", | ||
| RUNTYPE="@[RUNTYPE]", | ||
| USE_RESTART_TIME="@[USE_RESTART_TIME]", | ||
| FRAZIL_FWSALT="@[FRAZIL_FWSALT]", | ||
| RUNID="@[RUNID]", | ||
| CICE_HIST_AVG="@[CICE_HIST_AVG]", | ||
| DUMPFREQ_N="@[DUMPFREQ_N]", | ||
| DUMPFREQ="@[DUMPFREQ]", | ||
| DT_THERM="@[DT_THERM_MOM6]", | ||
| DT_DYNAM="@[DT_DYNAM_MOM6]", | ||
| MOM6_RIVER_RUNOFF="@[MOM6_RIVER_RUNOFF]") | ||
|
|
||
| # Specify output files: | ||
| criteria output { | ||
| # WORKFILE .comparison. TARGET | ||
| 'mediator_FBAtmOcn_o_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBAtm_a_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBIce_i_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBOcn_o_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBaccumAtmOcn_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBaccumAtm_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBaccumIce_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'mediator_FBaccumOcn_restart.nc' .bitcmp. "@[CNTL]" | ||
| 'RESTART/MOM.res.nc' .bitcmp. "@[CNTL]" | ||
| 'RESTART/MOM.res.nc' .bitcmp. "@[CNTL]" | ||
| 'RESTART/MOM.res_1.nc' .bitcmp. "@[CNTL]" | ||
| 'RESTART/MOM.res_2.nc' .bitcmp. "@[CNTL]" | ||
| 'RESTART/MOM.res_3.nc' .bitcmp. "@[CNTL]" | ||
| 'RESTART/iced.2011-10-03-00000.nc' .bitcmp. "@[CNTL]" | ||
| # Executable validation. This makes an MD5 sum of the datm.exe | ||
| # for comparison against the MD5 sum made in the build job. | ||
| # This is to ensure the executable did not change during the | ||
| # test suite. | ||
| "@[build%target]" .md5cmp. "@[datm_mom6_cice.exe%md5sum]" | ||
| } | ||
|
|
||
| spawn execute { | ||
| # Run the | ||
| {"@[build%target]", ranks="@[TASKS]" } | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please check out tag 2019.01 revision: 708b8d5, which is used in s2s. We are working on bringing in the latest GFDL dycore with FMS release tag 2020.02 in ufs-weather-model. GFDL did test ufs-weather-model for FMS release, we do not directly use the top of master in ufs applications.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When I checkout this branch, I do see tag 2019.01 and 708b8d5 as the hash.
The branch=master also is present in the ufs-s2s-model .gitmodules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The FMS version is correct.