Add ozone field from atm -> lnd #212

billsacks · 2021-07-15T23:17:19Z

Description of changes

Add ozone field from atm -> lnd, and namelist definition for the atm_ozone_frequency variable which will appear in drv_flds_in.

This will work together with changes in CAM (to send ozone and set atm_ozone_frequency), CESM_share (to facilitate reading atm_ozone_frequency) and CTSM (to receive ozone and read atm_ozone_frequency), but the changes here can be brought in independently of those changes.

Specific notes

Contributors other than yourself, if any: @mvertens

CMEPS Issues Fixed (include github issue #):

Are changes expected to change answers?

bit for bit
different at roundoff level
more substantial

Any User Interface Changes (namelist or namelist defaults changes)?

Yes
No

Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required):

(recommended) CIME_DRIVER=nuopc scripts_regression_tests.py
- machines:
- details (e.g. failed tests):
(recommended) CESM testlist_drv.xml
- machines and compilers:
- details (e.g. failed tests):
(optional) CESM prealpha test
- machines and compilers
- details (e.g. failed tests):
(other) please described in detail
- SMS_D_Ln1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCropQianRs.cheyenne_intel
- SMS_D_Ln1_Vnuopc.f10_f10_mg37.F2000climo.cheyenne_intel

Testing performed if application target is UFS-coupled:

(recommended) UFS-coupled testing
- description:
- details (e.g. failed tests):

Testing performed if application target is UFS-HAFS:

(recommended) UFS-HAFS testing
- description:
- details (e.g. failed tests):

Hashes used for testing:

CESM:
- repository to check out: https://github.com/ESCOMP/CESM.git
- hash: 997657f
  - In addition to this CMEPS branch, used:
    - CAM at 8f93d2a
    - CESM_share at 82006bf
    - diffs in CLM to call shr_ozone_coupling_readnl and print the returned value
UFS-coupled, then umbrella repostiory to check out and associated hash:
- repository to check out:
- branch:
- hash:
UFS-HAFS, then umbrella repostiory to check out and associated hash:
- repository to check out:
- branch:
- hash:

The code to parse this value will live in a different repository (in the share code), so it would be annoying to have the valid values here: if a new valid value is added, changes would be needed here in addition to the share code.

billsacks · 2021-07-15T23:18:13Z

@mvertens - I can run additional testing if you feel more is required. (I wasn't sure what level of testing you would typically do for minor changes like this.)

billsacks · 2021-07-15T23:19:12Z

mediator/fd_cesm.yaml

@@ -318,6 +318,10 @@
       canonical_units: 1e-6 mol/mol
       description: atmosphere export - prognostic CO2 at the lowest model level
     #
+     - standard_name: Sa_o3
+       canonical_units: 1e-9 mol/mol


@fvitt can you please check these units? I took a guess that CAM's ozone is specified in ppbv, but I'm not sure if that's right.

fvitt · 2021-07-16T15:30:57Z

cime_config/namelist_definition_drv_flds.xml

+      indicates whether the timestep-level values are interpolated from a
+      coarser temporal resolution.
+    </desc>
+  </entry>


What are the excepted settings for this option?

I went back and forth on whether to include valid values here. I tentatively decided not to list them here because of maintainability concerns: Nothing in this repository cares what the value of this variable is, since the code to read it in is in the CESM_share repository (ESCOMP/CESM_share#4). So I felt that listing the valid values here might be more painful than helpful, because if a new possible value is added, then this repository would need to be updated just for the sake of adding this new value to the valid_values list. Note that I did define the valid values in CAM's namelist_definition; there they serve the purpose of ensuring that any entries in user_nl_cam are valid.

However, I don't feel strongly on that point, so if you feel that it would be valuable to add the valid_values here, I'm happy to do so.

I am fine with not listing valid values here.

For now I agree with @fvitt.

fvitt · 2021-07-16T15:38:38Z

mediator/fd_cesm.yaml

@@ -318,6 +318,10 @@
       canonical_units: 1e-6 mol/mol
       description: atmosphere export - prognostic CO2 at the lowest model level
     #
+     - standard_name: Sa_o3
+       canonical_units: 1e-9 mol/mol
+       description: atmosphere export - prognostic CO2 at the lowest model level


Should this be something like "atmosphere export - O3 in the lowest model layer (prognosed or prescribed)"?

Thanks for the catch. I have fixed this.

mvertens · 2021-07-20T15:56:51Z

cime_config/namelist_definition_drv_flds.xml

+      indicates whether the timestep-level values are interpolated from a
+      coarser temporal resolution.
+    </desc>
+  </entry>


For now I agree with @fvitt.

mvertens · 2021-07-26T15:44:27Z

@fvitt - Are you okay with this PR at this point? @Sacks - when should this be merged once reviews are accepted?

billsacks · 2021-07-26T16:03:53Z

The one thing I'd like to wait for is confirmation on the units we want to use for ozone concentration. In ESCOMP/CAM#404, @lkemmons suggested using mol/mol; I'd like to wait for any feedback from @fvitt or @danicalombardozzi on that point, which would require a change to the metadata in this PR.

danicalombardozzi · 2021-07-28T21:34:47Z

@billsacks I think units of mol/mol is a good suggestion. It's easily understandable to most people and can be easily converted to ppbv.

Based on input in ESCOMP/CAM#404

billsacks · 2021-07-28T23:11:05Z

The one thing I'd like to wait for is confirmation on the units we want to use for ozone concentration.

Okay, this is resolved, but now there's one more thing I'm waiting on in terms of discussion in the CAM PR, which is the name & type of the namelist flag, and whether we might need another flag for the spatial characteristics. I'll update this when that is resolved.

Add module to read ozone_coupling_nl This will work together with ESCOMP/CMEPS#212. However, this can safely be brought in prior to that PR, because this code is not yet invoked from anywhere.

billsacks · 2021-08-09T22:14:13Z

Okay, the relevant conversation in ESCOMP/CAM#404 has been resolved and no further changes are needed here. However, I see there is now a conflict that needs to be resolved. @mvertens I'm going to reach out to you by email for help resolving this.

Resolved Conflicts: mediator/esmFldsExchange_cesm_mod.F90

billsacks · 2021-08-09T23:34:26Z

I have resolved the conflict. I'm running a quick smoke test to make sure the new code builds & runs, then will comment here when it's ready to merge.

billsacks · 2021-08-10T02:01:34Z

I reran SMS_D_Ln1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCropQianRs.cheyenne_intel with the latest version to make sure I didn't mess up the non-trivial conflict resolution. This built successfully and ran to completion.

So this is ready to merge as far as I'm concerned.

commit 84a17b750eaf52a0dbf42b1078c3e2feed5d6023 Author: Denise Worthen <[email protected]> Date: Mon Dec 27 16:35:00 2021 -0500 tidy up, remove commented out code blocks commit 5fb8561c9614e1df1c426d45cca7fcca7853e9fd Author: denise.worthen <[email protected]> Date: Thu Dec 23 06:43:04 2021 -0700 switch src/dst masks for wave commit b873989ae5e037ac217aaa30077a3a1f677fcd34 Author: denise.worthen <[email protected]> Date: Tue Dec 21 16:57:30 2021 -0700 change Sw_zo to Sw_z0 for hafs commit cd2ae27d772a7adbc60fdc329b2a1f52168f3e72 Merge: 7a44b63 8b117b4 Author: Denise Worthen <[email protected]> Date: Thu Dec 16 09:08:43 2021 -0500 Merge branch 'NOAA-EMC:emc/develop' into feature/wavcoupling commit 7a44b63d586f7e38898d003b28a2e14a286a86ca Author: denise.worthen <[email protected]> Date: Sun Nov 14 06:02:31 2021 -0700 fix merge of stokes to ocn commit 6b599262d1c22f95b6f87eca3279a1a11ab3bbc4 Author: denise.worthen <[email protected]> Date: Fri Nov 12 06:22:27 2021 -0700 current tested changes for wave coupling commit 8ec7328df766444299ee28a7b403a2818fdcbb0e Author: denise.worthen <[email protected]> Date: Sat Oct 30 10:21:46 2021 -0600 add unity norm for wave * this is running but not sure of right setting here commit 8be8da038f2a71c38e9dbc211970e78f94182fba Author: denise.worthen <[email protected]> Date: Sat Oct 30 09:39:39 2021 -0600 add -> wav in post atm and post ocn commit fff8fbc0ba7750981c1449267a9a347aa918ced1 Author: denise.worthen <[email protected]> Date: Fri Oct 29 12:34:25 2021 -0600 change mapping for z0 commit 16364c255a203d77e9d58a510b7f5880c10dccf9 Author: denise.worthen <[email protected]> Date: Fri Oct 29 12:32:44 2021 -0600 add more wav coupling fields commit be3b1bb7eb9956c030caeb5cb27acb461eced6fd Merge: f0fa04c 5beead0 Author: Denise Worthen <[email protected]> Date: Fri Oct 29 14:31:19 2021 -0400 Merge branch 'NOAA-EMC:emc/develop' into feature/wavcoupling commit f0fa04c382d65d92bd6826e89facb8093b75f6b0 Author: denise.worthen <[email protected]> Date: Wed Oct 27 07:48:14 2021 -0600 add wave->atm field * sending only cpl_scalars back in export gave mediator error ESMF_GeomBaseGet Value unrecognized or out of range med_methods_mod.F90:424 commit 843a1f14f081b971a3aebcdbe07dcd31a9c9280d Author: denise.worthen <[email protected]> Date: Wed Oct 20 19:20:00 2021 -0600 add u10m,v10m from atm->wav commit a0011cb4021b7b271145fa82f281c0b61da92add Merge: aae1fe9 11884b6 Author: denise.worthen <[email protected]> Date: Fri Oct 15 14:08:05 2021 -0600 Merge remote-tracking branch 'MV/feature/cism_bugfixes' into feature/updcmeps commit 11884b680396101314cd223e54b6abd96c222241 Author: Mariana Vertenstein <[email protected]> Date: Wed Oct 13 22:41:15 2021 -0600 fix for issue #236 commit 95d0f10f5e1e6089c968cfd7cbe3424b7864eb1e Author: Mariana Vertenstein <[email protected]> Date: Wed Oct 13 19:48:22 2021 -0600 fix for cmeps issue #235 and removal of null setting for local pointer variables (issue #234) commit aae1fe93c71b9966c8be34889205816cfde1f4fc Merge: c26a1b6 f1d514f Author: denise.worthen <[email protected]> Date: Wed Oct 13 13:32:44 2021 -0400 Merge remote-tracking branch 'escomp/master' into feature/updcmeps commit f1d514f9ce456a6cbdbcfc26c0f1bf78ac255c01 Merge: f06fe9c ca2ecb3 Author: mvertens <[email protected]> Date: Wed Oct 13 11:09:58 2021 -0600 Merge pull request #228 from mvertens/feature/history_refactor refactor mediator history to permit new functionality ### Description of changes refactor mediator history to permit new functionality ### Specific notes This PR is a large refactor of CMEPS history function capability. There are 3 categories where this capability is now extended or added: instantaneous, average and auxiliary output. - Each component post phase (i.e. `med_phases_post_xxx_mod.F90`) now calls `med_phases_history_write_comp` and passes it its component id. - In turn med_phases_write_comp calls instantaneous, average and auxiliary output for that component. - **med_phases_history_write_inst_comp** - writes the import and export state for that component based on the new input attribute settings `history_n_xxx_inst` and `history_option_xxx_inst` - where xxx = [atm,ice,glc,lnd,ocn,rof,wav and med] - output files will have the form `<casename>.cpl.hi.atm.yyyy-mm-dd-sssss.nc` - **med_phases_history_write_avg_comp** - writes the import and export state for that component based on the new input attribute settings `history_n_xxx_avg` and `history_option_xxx_avg` - where xxx = [atm,ice,glc,lnd,ocn,rof,wav] - output files will have the form `<casename>.cpl.ha.atm.yyyy-mm-dd-sssss.nc` - **med_phases_history_write_aux_comp** - writes auxiliary history files that are normally high frequency mediator output files that contain more than one time sample on a file and that are used to spin up a prognostic component (e.g. the ocn or lnd carbon cycle) - the following auxiliary files are now supported and to enable them simply set the histaux_*_enabled flage to .true. ```histaux_atm2med_file1_enabled = .true. histaux_atm2med_file1_auxname = atm.1h.inst histaux_atm2med_file1_doavg = .false. histaux_atm2med_file1_flds = Faxa_swndr:Faxa_swvdr:Faxa_swndf:Faxa_swvdf histaux_atm2med_file1_history_n = 1 histaux_atm2med_file1_history_option = nhours histaux_atm2med_file2_enabled = .false. histaux_atm2med_file1_ntperfile = 24 histaux_atm2med_file2_auxname = atm.1h.avrg histaux_atm2med_file2_doavg = .true. histaux_atm2med_file2_flds = Sa_u:Sa_v histaux_atm2med_file2_history_n = 1 histaux_atm2med_file2_history_option = nhours histaux_atm2med_file2_ntperfile = 24 histaux_atm2med_file3_enabled = .false. histaux_atm2med_file3_auxname = atm.3hprec.avrg histaux_atm2med_file3_doavg = .true. histaux_atm2med_file3_flds = Faxa_rainc:Faxa_rainl:Faxa_snowc:Faxa_snowl histaux_atm2med_file3_history_n = 3 histaux_atm2med_file3_history_option = nhours histaux_atm2med_file3_ntperfile = 8 histaux_atm2med_file4_enabled = .false. histaux_atm2med_file4_auxname = atm.3h.avrg histaux_atm2med_file4_doavg = .true. histaux_atm2med_file4_flds = Sa_z:Sa_topo:Sa_u:Sa_v:Sa_tbot:Sa_ptem:Sa_shum:Sa_dens:Sa_pbot:Sa_pslv:Faxa_lwdn:Faxa_rainc:Faxa_rainl:Faxa_snowc:Faxa_snowl:Faxa_swndr:Faxa_swvdr:Faxa_swndf:Faxa_swvdf:Sa_co2diag:Sa_co2prog histaux_atm2med_file4_history_n = 3 histaux_atm2med_file4_history_option = nhours histaux_atm2med_file4_ntperfile = 8 histaux_atm2med_file5_auxname = atm.24h.avrg histaux_atm2med_file5_doavg = .true. histaux_atm2med_file5_enabled = .false. histaux_atm2med_file5_flds = Faxa_bcph:Faxa_ocph:Faxa_dstwet:Faxa_dstdry:Sa_co2prog:Sa_co2diag histaux_atm2med_file5_history_n = 1 histaux_atm2med_file5_history_option = ndays histaux_atm2med_file5_ntperfile = 1 histaux_lnd2med_file1_auxname = lnd.ncpl.inst histaux_lnd2med_file1_doavg = .false. histaux_lnd2med_file1_enabled = .false. histaux_lnd2med_file1_flds = all histaux_lnd2med_file1_history_n = 1 histaux_lnd2med_file1_history_option = nsteps histaux_lnd2med_file1_ntperfile = 1 ``` - for file 1 history output is of the form <casename>.cpl.hx.atm.1h.inst.yyyy-mm-dd-sssss.nc - and the <atm.1h.inst> is specified by <histaux_atm2med_file1_auxname> Contributors other than yourself, if any: None CMEPS Issues Fixed: None Are changes expected to change answers? - [x] bit for bit Any User Interface Changes (namelist or namelist defaults changes)? (see above summary) - [x] Yes commit ca2ecb3c14121581456112aaa7f36aa8dc6117f7 Merge: ef01040 f06fe9c Author: Mariana Vertenstein <[email protected]> Date: Wed Oct 13 10:55:05 2021 -0600 updates to master commit ef01040680dea74bd9bcfd1a0d1688e8b29ad6d5 Author: Mariana Vertenstein <[email protected]> Date: Wed Oct 13 10:44:08 2021 -0600 updates required in code review for PR commit f06fe9cf12e4bd4b38bb6e469167ef2105e612d9 Author: Jim Edwards <[email protected]> Date: Thu Oct 7 08:25:13 2021 -0600 add testmod for y100k commit ca3a0adebb72fe7a6cc11ea7ee951bab4bfe634b Merge: 0217cf3 082cbd9 Author: Jim Edwards <[email protected]> Date: Wed Sep 29 17:35:03 2021 -0600 Merge pull request #233 from jedwards4b/fix_mesh_check_input_data ### Description of changes check_input_data needs this flag to properly download mesh files. ### Specific notes Change was tested by running the aux_cmeps test suite with flag --input-dir /glade/scratch/jedwards/inputdata/ to force a new download of inputdata. Contributors other than yourself, if any: CMEPS Issues : Fixes #196 Are changes expected to change answers? - [X] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [X] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [ ] (recommended) CESM testlist_drv.xml - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - [ ] (other) please described in detail - machines and compilers - details (e.g. failed tests): Testing performed if application target is UFS-coupled: - [ ] (recommended) UFS-coupled testing - description: - details (e.g. failed tests): Testing performed if application target is UFS-HAFS: - [ ] (recommended) UFS-HAFS testing - description: - details (e.g. failed tests): Hashes used for testing: - [ ] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - branch: - hash: - [ ] UFS-coupled, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: - [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: commit 082cbd9b7f93e3f57a0bb40a22dc65719ccb95aa Author: Jim Edwards <[email protected]> Date: Wed Sep 29 13:57:14 2021 -0600 add flag for check_input_data commit 4ed6e9ce6317e05f0f42ca66e383fc959dde1db7 Author: Mariana Vertenstein <[email protected]> Date: Mon Sep 27 11:17:59 2021 -0600 refactored testlist commit 3c5a7848911a8abaee42d99d6459567457429719 Author: Mariana Vertenstein <[email protected]> Date: Sun Sep 26 22:49:11 2021 -0600 made the F2000 test nuopc rather than mct commit a2aecf42a229edef9c86033f434165cacd55d5d5 Merge: 21a1276 0217cf3 Author: Mariana Vertenstein <[email protected]> Date: Sun Sep 26 22:23:22 2021 -0600 updates to master commit 21a1276f2efd7d6c50373047603429510c4fbffa Author: Mariana Vertenstein <[email protected]> Date: Sun Sep 26 11:56:15 2021 -0600 added more debugging info commit 313f0f3b62023e49aad6374f766c2a2d1bca4dcb Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 25 14:47:00 2021 -0600 refactored aux and avg history files and restart output commit f5a319e67830f8d3313821da476a3498796ffc37 Author: Mariana Vertenstein <[email protected]> Date: Fri Sep 24 19:30:36 2021 -0600 refatored inst output mode commit 0217cf372eaac61f5f209ffb889b93bee4759a60 Merge: 09659a9 b60e53c Author: mvertens <[email protected]> Date: Fri Sep 24 14:42:06 2021 -0600 Merge pull request #232 from mvertens/feature/restart_bugfix The lnd->rof accumulation fields are not being written to or read from the restarts with PR cmeps0.13.27 and this PR fixes that. This will only effect CESM configurations. This PR is bfb. commit b60e53cb5ba87c6c5572d3f00fa60890486daeaf Author: Mariana Vertenstein <[email protected]> Date: Fri Sep 24 09:59:55 2021 -0600 fixed compilation bug commit 09659a93bf31a801126d923a758df3877b9d1720 Merge: c5cb7ba 6d27534 Author: mvertens <[email protected]> Date: Fri Sep 24 09:53:27 2021 -0600 Merge pull request #230 from swensosc/master Pass tributary water depth and channel bankfull depth from rof to lnd This is should be a bfb enhancement that only matters if the new field is actually used. commit 6c05e2d3795daabb0b6ee25e1151c35ae52313df Author: Mariana Vertenstein <[email protected]> Date: Fri Sep 24 09:36:02 2021 -0600 fixed restart problem for aux_cam and aux_clm tests commit 6d77bc40f34ec3b49b7a953eed1a0eaa8398c685 Author: Mariana Vertenstein <[email protected]> Date: Thu Sep 23 23:17:53 2021 -0600 fixed issues with alarms commit c5cb7ba012043a7d9e47ee84e5a898f7e5506641 Merge: c240948 a28b585 Author: Mariana Vertenstein <[email protected]> Date: Wed Sep 22 14:30:47 2021 -0600 updated documentation from newdoc commit efb9870f089c9a18d826c4995a348aa9b75e17c3 Author: Mariana Vertenstein <[email protected]> Date: Wed Sep 22 14:27:35 2021 -0600 fixed accumulation to rof from lnd restart issue commit 320d751016c1168d9b9ef81c766c3501df9ad54f Author: Mariana Vertenstein <[email protected]> Date: Tue Sep 21 21:50:25 2021 -0600 backed out changes to med_phases_post_gcl commit c26a1b65a6d0d1934ecab0ddd72babdeb020e761 Merge: 233a89b c240948 Author: denise.worthen <[email protected]> Date: Tue Sep 21 14:44:34 2021 -0400 Merge remote-tracking branch 'escomp/master' into feature/updcmeps commit 6d27534fa9f195d933101bd31505f237c7da5e91 Author: Sean Swenson <[email protected]> Date: Mon Sep 20 14:30:54 2021 -0600 add new rof to lnd field commit 6c54e3e658a4caac0c13a580e1c291db6d91b0c9 Author: Mariana Vertenstein <[email protected]> Date: Mon Sep 20 13:23:26 2021 -0600 added fixes for multiple ice sheets commit bc07453d89f2ea4a1d3a35fc0c3aa5d004c1da43 Author: Mariana Vertenstein <[email protected]> Date: Mon Sep 20 12:31:12 2021 -0600 updates to clean up med_phases_prep_glc commit 594fd002fb04fb05e934db754d773d1d19f8f139 Author: Mariana Vertenstein <[email protected]> Date: Sun Sep 19 20:05:01 2021 -0600 updates to have l2x1yr aux file written commit 76a5e4827872183ec81bd8cdc8208b125750040d Author: Mariana Vertenstein <[email protected]> Date: Wed Sep 15 15:09:38 2021 -0600 fixes based on aux_glc testing commit a8fa99910f78de29ac4d74b20246204a0332833f Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 11 22:43:09 2021 -0600 more cleanup and code sharing commit f19485f8024f95eec75a1aedc5cc04d28cb804fc Merge: 6956aeb c240948 Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 11 17:13:30 2021 -0600 Merge branch 'master' into feature/history_refactor commit c240948a3ffe2db5116fe5db7b10d1630640d9db Merge: 8e95f7e 149dd16 Author: mvertens <[email protected]> Date: Sat Sep 11 17:11:49 2021 -0600 Merge pull request #226 from mvertens/feature/refactor_accum refactor accum field bundles and cleanup of mediator phase InitializeIPDv03p4 This PR does several things. 1. The accumulated import field bundles are no longer arrays and have been removed from `med_internalstate_mod.F90`. All import accumulator field bundles are now module variables in `med_phases_prep_rof_mod.F90` and `med_phases_prep_glc_mod.F90`. In both of these cases accumulation is done using the import field bundle on the import grid and the averaged, mapped and merged to the export field bundle. 2. The accumulated export field bundles is no longer an array and only refers to ocean export accumulation. This field bundle now appears in the following section in `med_internalstate_mod.F90`. ```.F90 ! Accumulators for export field bundles type(ESMF_FieldBundle) :: FBExpAccumOcn ! Accumulator for various components export on their grid integer :: ExpAccumOcnCnt = 0 ! Accumulator counter for each FBExpAccum ``` 3. The mediator subroutine `InitializeIPDv03p4` in `med.F90` serves to optionally modify the decomp/distr of transferred Grid/Mesh. In particular, the transfer of the grid was extremely difficult to follow. The cleanup in this PR makes it much clearer to see what is happening when a grid is transferred to the mediator and needs a new distgrid created for the mediator PEs. Are changes expected to change answers? No Any User Interface Changes (namelist or namelist defaults changes)? No commit 149dd16158b8bbadc812f73948a13bd2a4147823 Merge: 1e0f22d 8e95f7e Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 11 16:56:36 2021 -0600 resolved conflict with master commit 6956aeb1a086f411cce3bf8daf1a6effc42f2548 Merge: ff422ba eb6fe9b Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 11 13:44:29 2021 -0600 merged to head of feature/refactor_accum commit 1e0f22d338d1e02277185e73c2013618f07c12b4 Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 11 13:27:33 2021 -0600 updates for NUOPC_Realize call if mesh is transferred commit eb6fe9b9977d64e0754e4b05900c2f93e08691d7 Author: Jim Edwards <[email protected]> Date: Thu Sep 9 15:27:48 2021 -0600 add pylint required encoding to open commit 877b1c86bbf50b0ad200a2bee0cf35ed3415f1ab Author: Jim Edwards <[email protected]> Date: Thu Sep 9 15:09:50 2021 -0600 only one shared modelio namelist per component commit ff422ba56139a7fd0b177d339569a372d78fb1ba Author: Mariana Vertenstein <[email protected]> Date: Fri Sep 10 12:18:03 2021 -0600 put in call to mediator history output in med_phases_aofluxes_mod.F90 commit 8e95f7e8022782e177ea4dea203ecdcf70e08bb6 Merge: b19355f 2595ee3 Author: Jim Edwards <[email protected]> Date: Fri Sep 10 11:39:59 2021 -0600 Merge pull request #227 from jedwards4b/share_modelio_namelist commit 2595ee3a6bfc4e3694a848d77c77b5ea1f4d0810 Author: Jim Edwards <[email protected]> Date: Thu Sep 9 15:32:04 2021 -0600 one more open statement commit 7583d95b14d141c9faae362052af7e8c9da3a2f8 Author: Jim Edwards <[email protected]> Date: Thu Sep 9 15:27:48 2021 -0600 add pylint required encoding to open commit 903e4f995cc94b801a109036a9577b83e83dd969 Author: Jim Edwards <[email protected]> Date: Thu Sep 9 15:09:50 2021 -0600 only one shared modelio namelist per component commit 9cb2db402acf43326a1d2974af6a5a3a1c307e77 Author: Mariana Vertenstein <[email protected]> Date: Thu Sep 9 08:50:13 2021 -0600 refactored history all write to use model clock commit dd0a5af9ed4115a1491496d25d48866920f71b7c Author: Mariana Vertenstein <[email protected]> Date: Wed Sep 8 10:25:01 2021 -0600 more code reuse introduced in med_phases_history_mod commit 233a89b7cde0215e23e4d20db14dca5ff6df8a5b Author: denise.worthen <[email protected]> Date: Tue Sep 7 17:46:36 2021 -0400 add fix for file writing when dststatus_print=true * add local flag to control whether to write the dststatus file for a particular RH. This prevents writing a dststatus file for consf_aofrac which contains garbage (since the RH is a copy, and dststatus field is not set) or a dststatus file for mapcopy commit 75cc5da12c274b50bd2ea48f53f1f9380531f1f3 Author: Jim Edwards <[email protected]> Date: Tue Sep 7 12:41:13 2021 -0600 add explicit encoding to open statements commit ffcdf1c867b1fd29415bcc7755f213af064ee70a Merge: 1b3ae0f a2ed0c7 Author: mvertens <[email protected]> Date: Tue Sep 7 10:41:51 2021 -0600 Merge pull request #2 from DeniseWorthen/feature/cmepsaccum fixes for ufs error in completeFieldInitialization commit a2ed0c75b3c37873a7ab4841783700074f631192 Author: denise.worthen <[email protected]> Date: Tue Sep 7 08:54:06 2021 -0600 fix compile issue commit 7fbae523cc05bac470eb7b5ea393a9f306302ade Author: denise.worthen <[email protected]> Date: Tue Sep 7 10:04:10 2021 -0400 clean up trailing whitespace commit 1d9492e65964de4ddfafa5e4a2815318d4384645 Author: denise.worthen <[email protected]> Date: Tue Sep 7 09:53:52 2021 -0400 add chkerrs commit 81bed32d09226f308ff90e7ac45895aa7df0043a Author: denise.worthen <[email protected]> Date: Tue Sep 7 07:43:17 2021 -0600 fix for ufs in completefieldinitialize * use newgrid to clarify what is happening in * add comments to explain what happens at end of ipdv03p4 * remove explicit FieldEmptyComplete for grid fields after transfer to mesh using NUOPC_realize; add bailout if field are not actually complete commit 4c291c4e2d248666a0d767caf40a1de85b2bf612 Author: Mariana Vertenstein <[email protected]> Date: Mon Sep 6 20:51:19 2021 -0600 refactored different write phases to use module datatypes commit 8d07938f7b5f8dfcd75c4e4d1023c73c8b0fd632 Author: Mariana Vertenstein <[email protected]> Date: Mon Sep 6 14:22:42 2021 -0600 more cleanup commit a80f7432016601d7ea5a369abea7da37bc1b673e Author: denise.worthen <[email protected]> Date: Sun Sep 5 09:40:20 2021 -0400 add chkerrs commit 31525e71e3157fb45cc4d547f594af0ce4033b95 Author: Mariana Vertenstein <[email protected]> Date: Sat Sep 4 11:06:57 2021 -0600 more refactoring of history output to enable code reuse commit 15e2b9b80b0f0d1197e9a1d2fb995ec35b4e62ac Author: Mariana Vertenstein <[email protected]> Date: Thu Sep 2 16:53:03 2021 -0600 refactor of med_io_mod time initialization commit 11357ffb5bf10b1e458967c65c60b96798734372 Merge: be343d8 1b3ae0f Author: denise.worthen <[email protected]> Date: Wed Sep 1 13:51:18 2021 -0400 Merge remote-tracking branch 'MV/feature/refactor_accum' into feature/cmepsaccum commit 63996163f139d83e398bb6775022f2d0a91b87e3 Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 30 20:05:39 2021 -0600 got time average alarms to work correctly commit 4e6b637a371648da4da1b3f6297e0880b7b0087d Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 30 15:06:44 2021 -0600 average history file fixes commit 4dc835f11d6de2bd32546ba2f8a37b1644f1ca5b Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 30 11:44:35 2021 -0600 more cleanup of new history capability for averaging commit 6974330999ac71b79fc9a3d61de9d681a57c6663 Author: Mariana Vertenstein <[email protected]> Date: Sun Aug 29 17:23:04 2021 -0600 removed component history phases as run sequence options and moved the calls to post phases commit f4b9f2d2f7b7aed4c42516261b9a00960e83ec4b Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 27 20:37:51 2021 -0600 revert to master version commit 5cd0bb296d39d8e9232ac4c968d7445629b03697 Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 27 20:31:34 2021 -0600 reverted changes to master versions commit 657ee4bed3e9362ff3084c5bde609593e08a5dae Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 27 20:29:19 2021 -0600 remote conflict in merge commit fde3e012a2a0b80cffefde170d5b2e49962c36ca Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 27 20:21:33 2021 -0600 merge to master commit 1b3ae0f6d0243dd7f00afdddac44fa4610818b32 Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 24 17:31:43 2021 -0600 added encoding='utf-8' to open file lines in buildexe and buildnml commit c6d5c116fd7248344c690b97c94c86c5bb7d7e5c Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 24 15:28:59 2021 -0600 fixes needed for ufs testing failures commit be343d8ec84e3b940b1cabb0e2546c5393f9c602 Merge: 87290b5 b19355f Author: denise.worthen <[email protected]> Date: Sat Aug 21 05:56:19 2021 -0400 Merge remote-tracking branch 'escomp/master' into feature/updcmeps commit 87290b5de742905171c24cb04cdc0bd90070a12a Merge: cc6f2b9 7d7c066 Author: denise.worthen <[email protected]> Date: Sat Aug 21 05:45:33 2021 -0400 Merge remote-tracking branch 'upstream/emc/develop' into feature/updcmeps commit eb8341fbd2ced8346d29dd0e9c452d1978970951 Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 17 11:46:03 2021 -0600 refactored and significantly cleaned up the InitializeIPDv03p4 routine in med.F90 commit 92ba9180522580cd7ae6948d3250bf25180abb38 Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 17 11:27:56 2021 -0600 replaced export accumulator field arrays with just the ocn accumulated field bundle and counter - verified bfb commit 3f7cafca2178d4c6d5d196ea479589cad5d1113b Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 17 10:02:43 2021 -0600 removed all references to is_local%wrap%FBImpAccum - this is no longer needed. Validated that results were still bfb commit 367c0ecc26dc17678eb660872146232fa62558fa Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 17 09:44:01 2021 -0600 update for prep_rof commit e06fa827db144f5d5d08412fd2dd337d84a4fb13 Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 17 09:05:29 2021 -0600 more updates to refactor accum and verified that ERS_Vnuopc_Ld5.f19_g17.B1850.cheyenne_intel.allactive-defaultio was bfb with cmeps0.13.25 commit 1ba45a677ce1b1b32fd3be18ccbc5600c4b56420 Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 16 19:29:58 2021 -0600 updated med_merge_mod and associated prep phase interfaces and verified that ERS_Vnuopc_Ld5.f19_g17.B1850.cheyenne_intel.allactive-defaultio was bfb with cmeps0.3.25 commit 4f617580a53eba01d4c2266b9b846fbe92154323 Merge: fccfd3f 5826e50 Author: mvertens <[email protected]> Date: Mon Aug 16 16:50:39 2021 -0600 Merge pull request #1 from DeniseWorthen/feature/history_updates_add_albedos history updates, add albedos commit b19355f961d1b966ec21356ca220b60de37d5c8d Merge: ec8fd6b 84c3012 Author: mvertens <[email protected]> Date: Thu Aug 12 16:22:51 2021 -0600 Merge pull request #223 from mvertens/feature/fix_xgrid_bugs fix aoflux agrid/xgrid problems found in testing ### Description of changes bug fixes for new agrid/ogrid and restart functionality ### Specific notes 1. add fixes for computing aofluxes on both agrid and xgrid in compsets with data ocean and active atm (i.e. F/Q compsets in CESM) 2. fix problem associated with running ERS/ERR tests with new introduction of write_restart_at_endofrun Contributors other than yourself, if any: CMEPS Issues Fixed: None (no issues were raised for the problems being fixed) Are changes expected to change answers? - [x] bit for bit Any User Interface Changes (namelist or namelist defaults changes)? - [x] Yes - write_restart_at_endofrun default has been changed Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [x] (recommended) CESM testlist_drv.xml - machines and compilers: cheyenne/intel - details (e.g. failed tests): - bfb compared to baseline cmeps0.13.22, - verifed that SMS_Ld7_Vnuopc.f09_g17.B1850.cheyenne_intel.allactive-defaultio cesm2_3_alpha05b_nuopc Hashes used for testing: - [x] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - hashes: cesm2_3_alpha05b with the following changes: cime: cime6.0.5 cism: cismwrap_2_1_87 cdeps: cdeps0.12.20 commit 84c3012a936e95b98d5ef3b86e17aa2aa1a7ed67 Author: Mariana Vertenstein <[email protected]> Date: Wed Aug 11 15:39:51 2021 -0600 removed references to is_local%wrap%do_med_aoflux commit 4fcd0583f737f4f01b2c8c04bc2e58dd78b749ed Author: Mariana Vertenstein <[email protected]> Date: Wed Aug 11 15:37:59 2021 -0600 removed references to is_local%wrap%do_med_aoflux commit 5826e5011861dfa8dc1af03445de383441aa2c27 Merge: 7e9b3f0 7d7c066 Author: Denise Worthen <[email protected]> Date: Wed Aug 11 17:15:26 2021 -0400 Merge branch 'NOAA-EMC:emc/develop' into feature/history_updates_add_albedos commit 83baa6876e063a82a98931e76991baf1d92a4adc Author: Mariana Vertenstein <[email protected]> Date: Wed Aug 11 14:01:47 2021 -0600 put in fix for history output of agrid aoflux output on ocn grid commit b4b2a2208102023500239e264a1296422dc70ff7 Author: Mariana Vertenstein <[email protected]> Date: Wed Aug 11 10:57:15 2021 -0600 fixed hafs testing problem commit 43604f1b3b58d53d3c91f52dbf2c753267e980f5 Merge: 73738ec ec8fd6b Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 9 20:09:00 2021 -0600 Merge branch 'master' into feature/fix_xgrid_bugs commit ec8fd6b322ee4c2057189ea8dced8fe5099f1181 Merge: ed310ed b61dff4 Author: mvertens <[email protected]> Date: Mon Aug 9 20:08:29 2021 -0600 Merge pull request #212 from billsacks/pass_ozone Add ozone field from atm -> lnd ### Description of changes Add ozone field from atm -> lnd, and namelist definition for the atm_ozone_frequency variable which will appear in drv_flds_in. This will work together with changes in CAM (to send ozone and set atm_ozone_frequency), CESM_share (to facilitate reading atm_ozone_frequency) and CTSM (to receive ozone and read atm_ozone_frequency), but the changes here can be brought in independently of those changes. ### Specific notes Contributors other than yourself, if any: @mvertens Are changes expected to change answers? - [x] bit for bit Any User Interface Changes (namelist or namelist defaults changes)? - [x] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [x] (other) please described in detail - SMS_D_Ln1_Vnuopc.f10_f10_mg37.I2000Clm50BgcCropQianRs.cheyenne_intel - SMS_D_Ln1_Vnuopc.f10_f10_mg37.F2000climo.cheyenne_intel Hashes used for testing: - [x] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - hash: `997657f` - In addition to this CMEPS branch, used: - CAM at `8f93d2a` - CESM_share at `82006bf` - diffs in CLM to call `shr_ozone_coupling_readnl` and print the returned value commit b61dff448f2a981217ddacaf70e94c3dbf53969a Merge: 74d3692 ed310ed Author: Bill Sacks <[email protected]> Date: Mon Aug 9 17:28:25 2021 -0600 Merge remote-tracking branch 'origin/master' into pass_ozone Resolved Conflicts: mediator/esmFldsExchange_cesm_mod.F90 commit 73738ecf245368b6340fc016d9cbf2efe39e7c04 Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 9 12:57:44 2021 -0600 incorporated normalization of one initializaiton in route handle creation subroutine commit 1595be2b95a160f8ee40ec4de863df3460ab758e Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 9 10:29:53 2021 -0600 more fixes to get both C, G and F compsets all working commit 4ad10ab017a5862b61f13b41c950ba5b9883b521 Author: Mariana Vertenstein <[email protected]> Date: Sun Aug 8 20:48:34 2021 -0600 got xgrid and agrid working and verified for f09_f09_mg17 F2000climo commit bb9cc983d4683187ba2db8cb9929d76bb7f2a850 Author: Mariana Vertenstein <[email protected]> Date: Sun Aug 8 14:14:30 2021 -0600 a bit more cleanup commit 937dc040ac6118e23a17f5a5082015185a26fc27 Author: Mariana Vertenstein <[email protected]> Date: Sun Aug 8 13:26:17 2021 -0600 fixed bug introduced for F compsets in med.F90 commit 1c930f6e61f47daf0b6961e0993921b78c96b738 Author: Mariana Vertenstein <[email protected]> Date: Sat Aug 7 16:38:19 2021 -0600 more fixes to get aoflux calculation working for all compsets tested commit 8274bc55066bbf1a419bbbac1551d5801719850a Merge: 69d5fef ed310ed Author: Mariana Vertenstein <[email protected]> Date: Sat Aug 7 12:02:16 2021 -0600 merged to cmeps0.13.23 commit ed310edcbd0cf3071085ee7efdc73d7e40bf18f5 Merge: 9749b7d 0b00d51 Author: jedwards4b <[email protected]> Date: Sat Aug 7 11:09:59 2021 -0600 Merge pull request #224 from mvertens/feature/fix_ers_restart fix for ERS restart problem commit 0b00d51ea01772a05fa5952516f51cb50313a208 Author: Mariana Vertenstein <[email protected]> Date: Sat Aug 7 10:52:45 2021 -0600 fix for ERS restart problem commit 69d5fefa926fa8f6c2c4ecc449e916d14d50fb91 Author: Mariana Vertenstein <[email protected]> Date: Sat Aug 7 10:49:37 2021 -0600 updated logic for write_restart_at_endofrun commit 8638c9fc4af231d540db2860bd01cd7714406ef0 Author: Mariana Vertenstein <[email protected]> Date: Sat Aug 7 10:08:30 2021 -0600 changed testlist commit 328203fef88e15ad31c7b9785f8bfbda1e84a283 Author: Mariana Vertenstein <[email protected]> Date: Sat Aug 7 09:26:29 2021 -0600 fixed restart issues and runtime-issues associated with new xgrid logic commit 8b2a4a01c5d8926a8af1fc0a1f00823ef9b8d276 Merge: b46716a 9749b7d Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 6 16:19:07 2021 -0600 Merge branch 'master' into feature/fix_xgrid_bugs commit b46716a30c59eab606ec92f4c4ed230d1fde420f Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 6 16:13:06 2021 -0600 removed mct tests from testlist_drv.xml and renamed test category aux_cmeps commit 9749b7dce6467f9df0f641b165520d3c4198d9ae Merge: 6082732 473607e Author: jedwards4b <[email protected]> Date: Fri Aug 6 13:07:26 2021 -0600 Merge pull request #221 from jedwards4b/add_rest_option_end …run unless restart is none or never ### Description of changes Adds support for REST_OPTION='end', also all runs with any REST_OPTION other that none or never will write a restart file at the end of the run. ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Are changes expected to change answers? - [X] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [X] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [X] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: cheyenne intel nuopc all pass - details (e.g. failed tests): - [X] (recommended) CESM testlist_drv.xml - machines and compilers: cheyenne intel - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - [ ] (other) please described in detail - machines and compilers - details (e.g. failed tests): Testing performed if application target is UFS-coupled: - [ ] (recommended) UFS-coupled testing - description: - details (e.g. failed tests): Testing performed if application target is UFS-HAFS: - [ ] (recommended) UFS-HAFS testing - description: - details (e.g. failed tests): Hashes used for testing: - [X] CESM: cesm2_3_alpha5b - repository to check out: https://github.com/ESCOMP/CESM.git - branch: - hash: - [ ] UFS-coupled, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: - [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: commit 473607e7241e1887f9434d8db152e6bf5e4edf5f Author: Jim Edwards <[email protected]> Date: Fri Aug 6 13:02:33 2021 -0600 remove debug print statement commit 6f92298f7b0e65960a2c5d4889ea81c5adaf9bdd Author: Jim Edwards <[email protected]> Date: Fri Aug 6 12:13:20 2021 -0600 write mediator restart at endofrun commit 8ff918f500bc8f955710e74e4aeff42cfc65d996 Merge: dbb2339 6082732 Author: Mariana Vertenstein <[email protected]> Date: Fri Aug 6 10:53:04 2021 -0600 Merge branch 'master' into feature/fix_xgrid_bugs commit 6082732d36808fd794494c244bb23d0cfed03c7a Merge: df53e4e c2829e1 Author: jedwards4b <[email protected]> Date: Thu Aug 5 14:56:21 2021 -0600 Merge pull request #222 from mvertens/feature/fix_compile_bug fixed nag compilation problem ### Description of changes fix nag compilation problem ### Specific notes This lightweight PR fixes a nag compilation problem. Contributors other than yourself, if any: CMEPS Issues Fixed: None Are changes expected to change answers? - [x] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [x] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [ ] (recommended) CESM testlist_drv.xml - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - [x] (other) please described in detail - machines and compilers izumi/intel - details (e.g. failed tests): Verified that the following test now builds SMS_D_Ld3_Vnuopc.f45_g37_rx1.A.izumi_nag Testing performed if application target is UFS-coupled: - [ ] (recommended) UFS-coupled testing - description: - details (e.g. failed tests): Testing performed if application target is UFS-HAFS: - [ ] (recommended) UFS-HAFS testing - description: - details (e.g. failed tests): Hashes used for testing: - [ ] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - branch: - hash: cmeps0.13.20 - [ ] UFS-coupled, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: - [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: commit c2829e1a4f036a74cde28977e9f8b116cccce05d Author: mvertens <[email protected]> Date: Thu Aug 5 13:22:32 2021 -0600 fixed ang compilation problem commit 59fcbb3c37b0c05052928f79ea9c9838322bde0a Author: Jim Edwards <[email protected]> Date: Thu Aug 5 13:11:21 2021 -0600 add support for REST_OPTION end and always write a restart at end of run unless restart is none or never commit dbb23393925ad5e4160d2627258197df93656936 Author: Mariana Vertenstein <[email protected]> Date: Thu Aug 5 11:25:04 2021 -0600 fixes to have agrid/xgrid in F compsets - including everyone on the same grid commit df53e4e1947984433c6ba8c7f7f2f41d463a1de4 Merge: 95a5ef0 c0d8e01 Author: jedwards4b <[email protected]> Date: Wed Aug 4 15:00:42 2021 -0600 Merge pull request #219 from mvertens/feature/fix_runseq_bug commit c0d8e01f6330ee0d82fcef8f26c0be188d251e11 Author: Mariana Vertenstein <[email protected]> Date: Wed Aug 4 14:52:17 2021 -0600 fixed run sequence bug for G and C compsets commit 95a5ef0646d3c3c8ba80b2ef4e01c6e286b4ad45 Merge: 908b1b2 1430301 Author: jedwards4b <[email protected]> Date: Tue Aug 3 15:30:21 2021 -0600 Merge pull request #218 from mvertens/feature/fix_cimeconfig_bug commit 14303018b3d754e36b213d5df6b0005268c50757 Author: Mariana Vertenstein <[email protected]> Date: Tue Aug 3 15:00:13 2021 -0600 fix typo in config_component_cesm.xml commit 908b1b27b623c0d8b784588a8be900aa4eb03fba Merge: 53183fa fc1182f Author: mvertens <[email protected]> Date: Mon Aug 2 11:35:38 2021 -0600 Merge pull request #216 from mvertens/feature/exchange_grid expand aoflux calculation to include atmosphere grid and exchange grid - Previously the aoflux computation in the mediator could only be done on the ocean mesh. With this PR the aoflux computation can now be done on the ocean mesh, the atmosphere mesh or the exchange grid. - As part of this the mid-year restart bug Allow mid-year restart with active GLC/CISM #143 has been resolved. This also needs an update to cism that is coming in to a separate PR. The following test now passes: ERS_Vnuopc_Lm13.f10_f10_mg37.I1850Clm50SpG - esmFldsExchange_cesm.F90 has be refactored in order to explicitly indicate every field rather than using the fldnames loop. This will help in the migration to the new python based capability being developed by @uturuncoglu. commit fc1182f912fb7a2a7aba29db951803bf03c96676 Merge: 36f54b9 53183fa Author: Mariana Vertenstein <[email protected]> Date: Mon Aug 2 11:32:28 2021 -0600 merge to cmeps0.13.9 commit 53183fad253bb65b3a6866b10e7b9187576b72a5 Merge: 6ff50be 59a59c2 Author: mvertens <[email protected]> Date: Mon Aug 2 11:15:32 2021 -0600 Merge pull request #215 from mvertens/feature/new_run_sequence new run sequence for B1850 nuopc validation This PR requires ESMF https://github.com/esmf-org/esmf/releases/tag/ESMF_8_2_0_beta_snapshot_13 and later snapshots. With this new snapshot, this PR does the following: 1) Enables a new run RASM_OPTION1 sequence for fully coupled CESM nuopc simulations. The new run sequence will look like the following: ``` @432000 @10800 @3600 @1800 MED med_phases_aofluxes_run MED med_phases_prep_ocn_accum MED med_phases_ocnalb_run MED med_phases_diag_ocn @@3600 MED med_phases_prep_ocn_avg MED -> OCN :remapMethod=redist @@ ``` With this new run sequence, careful comparison with the RASM_OPTION1 cesm simulation validated this configuration for NUOPC with POP. 2) A fix to the budget table has been put in place to fix problems with MOM6 budgets when running a fully coupled simulation. commit 36f54b9f822359f1bbe58013b4f2e0366ac6a929 Author: Mariana Vertenstein <[email protected]> Date: Sun Aug 1 12:42:21 2021 -0600 fixed but for So_t to ice in esmFldsExchange_cesm.F90 commit 76c57ae68ef4116dc56d93803467f6f38e8fbac6 Merge: d5dc9a9 8779990 Author: Mariana Vertenstein <[email protected]> Date: Sat Jul 31 19:59:10 2021 -0600 Merge branch 'feature/fix_mom6diags' into feature/exchange_grid commit d5dc9a9df2f98e9b2e04e57cdd2ec6cd03b983ad Author: mvertens <[email protected]> Date: Sat Jul 31 15:09:06 2021 -0600 updates for glc prep commit fd3fe24e2d4bd680ea9eb5ddc2be5e67fa598c32 Author: mvertens <[email protected]> Date: Fri Jul 30 11:16:59 2021 -0600 fixed xgrid 2nd order mapping commit e45d525b302447da601541a2f0222c3699c19d76 Author: mvertens <[email protected]> Date: Thu Jul 29 22:39:35 2021 -0600 added second order conservative for Sa_u and Sa_v to xgrid commit b8a6dbba38d7f519aba39a4f7abeb9d7fea8b7a0 Author: mvertens <[email protected]> Date: Thu Jul 29 19:54:23 2021 -0600 update to fix xgrid mapping to ocn commit 7e9b3f0abf537d1716bdca02e960c0bd9f4acfd0 Merge: 9b53ff7 adca0ed Author: denise.worthen <[email protected]> Date: Thu Jul 29 15:54:42 2021 -0400 Merge branch 'emc/develop' into feature/history_updates_add_albedos commit 29391929746b35470066825e92d425706138ea22 Author: mvertens <[email protected]> Date: Thu Jul 29 13:13:23 2021 -0600 updates to get mid-year restarts working with CISM - resolves #143 commit 74d3692b03e87ccd3455d3fc4ad4bfec5cfcc61e Author: Bill Sacks <[email protected]> Date: Wed Jul 28 17:07:35 2021 -0600 Use mol/mol for units of Sa_o3 Based on input in https://github.com/ESCOMP/CAM/pull/404 commit 6ff50be34c0fe2836d1eb5072c15d2b812293c01 Merge: 22dc297 f461876 Author: Ufuk Turunçoğlu <[email protected]> Date: Wed Jul 28 14:57:08 2021 -0600 Merge pull request #217 from hafs-community/feature/pr Update for HAFS coupling mode and changes that are required for WW3 coupling under UFS commit 19d9a571b7cdecbd1da664f20d2635abcf59f5a6 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 25 19:56:34 2021 -0600 fixed problem when atm/ocn grid are the same and compilation with gnu commit 09e3e146fb654d402780b915de92c06ca23dc992 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 25 19:10:00 2021 -0600 removed DEBUG writes commit 05fdf8d075f1cc80e154bba8a35adc62dd706d45 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 25 14:21:17 2021 -0600 more cleanup of esmFldsExchange_cesm_mod commit b06520730dda01907ad233d613b70be257dd0d13 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 25 14:09:04 2021 -0600 more modularization of med_phases_aoflux commit 88804819fa9de09562bfe0b57b69e22f168e8e60 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 25 13:43:55 2021 -0600 more refactor updates to modularize aoflux calculation commit 3b275b605ec13fafeb890ce3470be537b35e3000 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 25 11:02:29 2021 -0600 refactored med_phases_aofluxes_mod for more code reuse commit f461876a3e8f1af0d43e080ba08368408c553f46 Merge: ca1bfc4 22dc297 Author: Ufuk Turuncoglu <[email protected]> Date: Fri Jul 23 15:20:18 2021 -0500 sync with ESCOMP master commit ca1bfc44023db45119daba9ee94e0c62067a2b4b Merge: b367433 d379e47 Author: Bin Liu <[email protected]> Date: Fri Jul 23 16:03:25 2021 -0400 Merge pull request #5 from hafs-community/feature/hafs_coupleww3 Merge feature/hafs_coupleww3 branch back to support/HAFS branch commit d379e47c66336a3f4c3ba239e96f8e6f33eb152a Author: Ufuk Turuncoglu <[email protected]> Date: Fri Jul 23 00:21:33 2021 -0500 fix for atm-wav configuration commit af38a87a78a1c1c565ce02d7a0ca4ce536cc76cd Author: Mariana Vertenstein <[email protected]> Date: Thu Jul 22 19:05:46 2021 -0600 cleanup commit 4ce60e9f78d6cedb67042f23a3a6b8be6511852e Author: Jim Edwards <[email protected]> Date: Thu Jul 22 14:03:54 2021 -0600 fix build issues commit c632e8aaa7d50ad324bff17c59b69f54d89c2f5b Author: Jim Edwards <[email protected]> Date: Thu Jul 22 13:27:34 2021 -0600 fix pylint issue, update github workflow esmf version commit 59a59c288b86c3265e5e2285353687f228322eda Author: Jim Edwards <[email protected]> Date: Thu Jul 22 13:19:14 2021 -0600 update ESMF version in github action commit b1d1e50b446591caecea4a31688111d2f8115cac Author: Mariana Vertenstein <[email protected]> Date: Wed Jul 21 21:14:17 2021 -0600 updates to get both aoflux agrid and xgrid working commit 9b53ff7528dc2cdfc8bef444d6db566219c944d0 Author: denise.worthen <[email protected]> Date: Wed Jul 21 19:04:32 2021 -0600 make diag_init optional commit 12681eb5f641de53d38ad06a64e55d2aeb5f5343 Merge: 3cdfe02 215bc3b Author: denise.worthen <[email protected]> Date: Wed Jul 21 12:57:40 2021 -0400 Merge remote-tracking branch 'origin/feature/add_albedos' into feature/history_updates commit 3cdfe02debd238cda5e7ec87b7c6b2ef30051872 Author: denise.worthen <[email protected]> Date: Wed Jul 21 09:23:23 2021 -0400 wrap long line commit 89c720f93942558a974fa8dafc08e948aafd1dc7 Author: denise.worthen <[email protected]> Date: Wed Jul 21 09:14:46 2021 -0400 white space and config changes commit 4445e35f62bd59808c49f7e9cc78c2d1cfbd5e31 Author: denise.worthen <[email protected]> Date: Tue Jul 20 17:24:12 2021 -0400 propagate name changes * change history config variables to match code commit cf77f348b0a48039267ab11a3f872ce110836576 Author: Ufuk Turuncoglu <[email protected]> Date: Tue Jul 20 16:17:53 2021 -0500 add missing code for wave coupling commit ac0ef28f5e8f719be5e04a24b5122c6c5142f596 Author: denise.worthen <[email protected]> Date: Tue Jul 20 14:03:14 2021 -0600 change order of history options in config * append component name and averaging type to history_n and history_option variables * trailing whitespace cleanup commit d54013a99bc9ca89052699776ce17932b6bedcf7 Merge: 5b3bde1 b367433 Author: Bin.Liu <[email protected]> Date: Mon Jul 19 14:05:56 2021 -0500 Merge remote-tracking branch 'origin/support/HAFS' into feature/hafs_coupleww3 Conflicts solved by Ufuk, Dan, and Bin. commit ef54ef96b12b6621b5d4c30dd3461a901d140c12 Author: Mariana Vertenstein <[email protected]> Date: Mon Jul 19 15:23:02 2021 -0600 updates to get aoflux on atm grid working commit 1e7b3989abff2d53fff2a58254c70a8658fe49e1 Author: Bill Sacks <[email protected]> Date: Mon Jul 19 14:37:46 2021 -0600 Fix Sa_o3 description commit b367433e7f6602599a4f0c5e903c4f3bbc7286ea Merge: 3fff4b7 bf6f2a5 Author: Bin Liu <[email protected]> Date: Mon Jul 19 14:52:44 2021 -0400 Merge pull request #4 from hafs-community/feature/hafs_couplehycom_cdeps Merge feature/hafs_couplehycom_cdeps back to support/HAFS commit d30c9c1a144ccd43dd4bc90f4d17988567f6bf9a Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 18 17:54:06 2021 -0600 more updates to have new code working on ogrid commit b4a19837492f3424084c16996a8ff00207f71082 Author: Mariana Vertenstein <[email protected]> Date: Sun Jul 18 14:54:34 2021 -0600 refactor of mapping file specification commit 4372fe2a8582a0e0a0de2e4a49e30b614c67d827 Author: Mariana Vertenstein <[email protected]> Date: Sat Jul 17 21:09:37 2021 -0600 fixes to get flux computation on ocean grid working commit 3a5725c6f751ba28a0a7a6494b9b1834fa5d9b5d Author: Mariana Vertenstein <[email protected]> Date: Sat Jul 17 20:40:37 2021 -0600 bug fixes commit 0e662b0b62db49e2ce8c79587801a3a144dd84a8 Author: Mariana Vertenstein <[email protected]> Date: Sat Jul 17 17:56:51 2021 -0600 first implementation of exchange grid commit 215bc3b57058af1910570b7eabea4f61e0a0f8e6 Author: denise.worthen <[email protected]> Date: Fri Jul 16 15:06:34 2021 -0600 add albedo fields ice->atm commit 5b3bde182f58254d3f0c2a5df7106f3af43b81f5 Merge: cf8021c 3fff4b7 Author: Bin.Liu <[email protected]> Date: Fri Jul 16 11:08:40 2021 -0500 Merge remote-tracking branch 'remotes/origin/support/HAFS' into feature/hafs_coupleww3 commit 2198e53ca71053a98d27d5005e9d016926657ce1 Merge: 08f18b5 22dc297 Author: denise.worthen <[email protected]> Date: Thu Jul 15 17:54:26 2021 -0400 Merge remote-tracking branch 'escomp/master' into feature/history_updates commit 08f18b535b28711b34e27a70195448e693730ef6 Merge: d5428cf fccfd3f Author: denise.worthen <[email protected]> Date: Thu Jul 15 17:17:00 2021 -0400 Merge remote-tracking branch 'MV/features/history_updates' into feature/history_updates commit 02169c597c9163fa8ff1f7c26c867753c1e77e22 Author: Mariana Vertenstein <[email protected]> Date: Wed Jul 14 21:48:45 2021 -0600 changes to get B1850 compset restart test passing commit bf6f2a5669621920a445af4ae94d615c8e0cd0af Merge: c095e5c 3fff4b7 Author: Bin.Liu <[email protected]> Date: Wed Jul 14 15:52:37 2021 -0500 Merge remote-tracking branch 'remotes/origin/support/HAFS' into feature/hafs_couplehycom_cdeps commit 480b2a8aebfa7c12f37fb27aa5f8919ddca1e4ca Author: Mariana Vertenstein <[email protected]> Date: Tue Jul 13 21:08:29 2021 -0600 fix to get mom6 budgets working for b1850mom commit 3fff4b7a88b55effaecb714f5f637f925283f920 Merge: 733c16d d5428cf Author: Bin.Liu <[email protected]> Date: Tue Jul 13 11:58:36 2021 -0500 Merge remote-tracking branch 'remotes/upstream/emc/develop' into support/HAFS commit 87799909bd27c2bbd6b731ee4fdf7f13ebe026e4 Author: Mariana Vertenstein <[email protected]> Date: Mon Jul 12 10:30:08 2021 -0600 fix diags to work with mom6 commit 66887b71f7201ab700fef4619675294b0789935f Author: Bill Sacks <[email protected]> Date: Sun Jul 11 18:30:25 2021 -0600 Remove valid values for atm_ozone_frequency The code to parse this value will live in a different repository (in the share code), so it would be annoying to have the valid values here: if a new valid value is added, changes would be needed here in addition to the share code. commit cf3dc8f6794f0be2c2b9b6094eff7059c95f4a7c Author: Bill Sacks <[email protected]> Date: Sun Jul 11 17:16:45 2021 -0600 Add atm_ozone_frequency drv_flds_in namelist variable commit 733c16d4e5ed9283f7bb659d5f36ee1f95de5983 Merge: 9f190dc e40bc30 Author: Bin.Liu <[email protected]> Date: Fri Jul 9 15:49:24 2021 -0500 Merge commit 'e40bc304d91c4df6333e7164e859f1830646794f' into support/HAFS commit a375d99573c7a574f02e2778e52d896948ffbb78 Author: Bill Sacks <[email protected]> Date: Wed Jul 7 15:41:47 2021 -0600 Add an atm->lnd Sa_o3 field commit 22dc297fa3f77cf1a232618f5428c89b460032ca Merge: e4f5384 4f1a4af Author: jedwards4b <[email protected]> Date: Wed Jun 30 10:52:00 2021 -0600 Merge pull request #209 from jedwards4b/timeInit_fix fix unitialized variable in timeInit, remove option ifdays0 commit e4f5384a8e0263fc8378d92df626b48057a81b3b Merge: 537740f 0d54e30 Author: jedwards4b <[email protected]> Date: Wed Jun 30 10:51:35 2021 -0600 Merge pull request #210 from jedwards4b/force_py3 change all shebangs to explicitly use python3 commit 0d54e30bbefdfff72be8a134add1d7baa7aaec95 Author: Jim Edwards <[email protected]> Date: Tue Jun 29 16:07:07 2021 -0600 change all shebangs to explicitly use python3 commit 537740f9a2a4b2e22ea361a2e76c7136b2e669a1 Author: Jim Edwards <[email protected]> Date: Mon Jun 28 14:29:54 2021 -0600 add GPU per node variables from cime PR #3989 commit 4f1a4af743fcc3615b7923ef73de7efc2e4724b8 Author: Jim Edwards <[email protected]> Date: Fri Jun 25 11:28:23 2021 -0600 fix unitialized variable in timeInit, remove option ifdays0 commit cc6f2b953e50f7b82efff2fea3b82377b2aaf75a Merge: 94964bf 0b2fa2f Author: denise.worthen <[email protected]> Date: Thu Jun 24 11:43:28 2021 -0400 Merge remote-tracking branch 'escomp/master' into feature/updcmeps commit c095e5c35d9ae4ee84792614bdca87d2bc3219f9 Author: Ufuk Turuncoglu <[email protected]> Date: Fri Jun 18 16:30:01 2021 -0500 update nems specific field dictionary and add new field for ERA5 commit 86ddf0ae38fefe44de2f1215a41b7db6ad4e015c Author: Ufuk Turuncoglu <[email protected]> Date: Fri Jun 18 16:29:07 2021 -0500 update HAFS specific field exchnage file and remove system_type commit 0b2fa2f873fbf9c4f26e1c1ce912dee8c5f133f8 Merge: 307d2be bce1ecd Author: jedwards4b <[email protected]> Date: Thu Jun 17 10:10:46 2021 -0600 Merge pull request #207 from jedwards4b/esmf_aware_threading_fixes ### Description of changes Add code to buildexe script to check that ESMF VERSION is new enough. ESMF 8.1 is required unless ESMF_AWARE_THREADING is enabled which requires 8.2.0 ### Specific notes Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Are changes expected to change answers? - [X] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [X] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [X] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: cheyenne intel (all pass) - details (e.g. failed tests): - [ ] (recommended) CESM testlist_drv.xml - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - [ ] (other) please described in detail - machines and compilers - details (e.g. failed tests): Testing performed if application target is UFS-coupled: - [ ] (recommended) UFS-coupled testing - description: - details (e.g. failed tests): Testing performed if application target is UFS-HAFS: - [ ] (recommended) UFS-HAFS testing - description: - details (e.g. failed tests): Hashes used for testing: - [ ] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - branch: - hash: - [ ] UFS-coupled, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: - [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: commit bce1ecdc83713e7fe1814299ddbea9c5ba5db01c Author: Jim Edwards <[email protected]> Date: Thu Jun 17 09:30:01 2021 -0600 move the version check to buildnml for faster feedback to user commit 11bcd200a6faf27ad97c7f34b943da6da247443a Author: Jim Edwards <[email protected]> Date: Thu Jun 17 08:03:38 2021 -0600 esmf aware threading now works with esmf 8.2.0b10 or newer commit 307d2bee5f98e09041eb0fa229a5a8c304c89564 Merge: c08337f 65045d2 Author: jedwards4b <[email protected]> Date: Tue Jun 15 07:24:58 2021 -0600 Merge pull request #205 from mvertens/feature/validation_bugfixes ### Description of changes The mapping of Faoo_fco2_ocn must have a normalization of 1 and must be mapped with mapconsd NOT mapconsf. ### Specific notes This was found during the validation of the compset `1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_SGLC_WW3_BGC%BPRP ` at f19_g17 This also fixes the problem encountered running a B1850 compset with cmeps0.13.10 Its important to note that current any mapping type for a given source->destination pair can only have one normalization. The problem was that between ocn->atm the old mapping for Faoo_fco2_ocn was mapconsf and the normalization was 1. The new error check introduced by @DeniseWorthen found a problem with the So_t between ocn->atm was trying to use a normalization of 'ofrac'. Contributors other than yourself, if any: CMEPS Issues Fixed: #204 Are changes expected to change answers? - [x] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [x] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [ ] (recommended) CESM testlist_drv.xml - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - [x] (other) please described in detail - machines and compilers - details (e.g. failed tests): Verified that the following test ran: SMS_Ld1_Vnuopc.f19_g17.B1850.cheyenne_intel Testing performed if application target is UFS-coupled: - [ ] (recommended) UFS-coupled testing - description: - details (e.g. failed tests): Testing performed if application target is UFS-HAFS: - [ ] (recommended) UFS-HAFS testing - description: - details (e.g. failed tests): Hashes used for testing: - [ ] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - hash: cesm2_3_beta03 (updated CIME to 71ddf1ced - current master) - [ ] UFS-coupled, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: - [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: commit 65045d27a0e8476260734910b08b0e2581c56a45 Author: Jim Edwards <[email protected]> Date: Tue Jun 15 07:13:54 2021 -0600 change this from INFO to ERROR commit d5b824646d3d1e3973f8dfb00335c25624bdc9b7 Author: Mariana Vertenstein <[email protected]> Date: Mon Jun 14 16:10:37 2021 -0600 removed extraneous do loop commit 1d847042e1082e2927d38d37c186a2cae3a6f2e5 Merge: c95b935 c08337f Author: Mariana Vertenstein <[email protected]> Date: Mon Jun 14 15:51:14 2021 -0600 Merge tag 'cmeps0.13.10' into feature/validation_bugfixes cmeps0.13.10 commit 94964bf3d28e14fd400e8804cdf44a990dbbca29 Merge: e40bc30 c08337f Author: denise.worthen <[email protected]> Date: Fri Jun 11 13:36:46 2021 -0400 Merge remote-tracking branch 'escomp/master' into feature/updcmeps commit c95b935c5da2149501711e8c4982519771e10a4b Author: Mariana Vertenstein <[email protected]> Date: Fri Jun 11 10:57:11 2021 -0600 validation bug fixes commit c08337f41befcb8ee1fbc9871af33b80e6e6f662 Merge: b5b67e4 d7c6346 Author: jedwards4b <[email protected]> Date: Thu Jun 10 13:05:03 2021 -0600 Merge pull request #198 from DeniseWorthen/feature/escompPR ### Description of changes Adds a second conservative mapping type (consf_aofrac) for use by ufs-weather which normalizes some ATM->OCN fluxes by the open water fraction on the ATM grid. ### Specific notes - adds a model abort if a user attempts to specify a second normalization type for a given ``n1:n2:maptype``. This enforces the single normalization restriction for the packed field bundles which is noted in the code comments but not otherwise enforced. - adds a second mapconsf routehandle for the second normalization type for use when coupling mode is ``nems_orig`` or ``nems_frac``. The second RH will be created only if mapconsf does not yet exist; if it exists the second RH will be a copy. - implements unity normalization for ufs-weather in esmFldsExchange_nems - fixes a gnu compile error for ufs-weather in ``med_fldList_Document_Mapping`` - removes fd_nems.yaml since it is now required in ufs-weather when CMEPS is not in use (e.g. standalone ATM or JEDI). - fixes unitialized AccumCnts Contributors other than yourself, if any: CMEPS Issues Fixed (include github issue #): Are changes expected to change answers? - [x] bit for bit - [ ] different at roundoff level - [ ] more substantial Any User Interface Changes (namelist or namelist defaults changes)? - [ ] Yes - [ ] No Testing performed if application target is CESM:(either UFS-S2S or CESM testing is required): - [ ] (recommended) CIME_DRIVER=nuopc scripts_regression_tests.py - machines: - details (e.g. failed tests): - [ ] (recommended) CESM testlist_drv.xml - machines and compilers: - details (e.g. failed tests): - [ ] (optional) CESM prealpha test - machines and compilers - details (e.g. failed tests): - [ ] (other) please described in detail - machines and compilers - details (e.g. failed tests): Testing performed if application target is UFS-coupled: - [X] (recommended) UFS-coupled testing - description: ufs-weather-model [177ea10 ](https://github.com/ufs-community/ufs-weather-model) - details (e.g. failed tests): This commit contains the current emc/develop branch of CMEPS updated with the latest ESCOMP/master. It breaks current RT baselines for ufs-weather solely because the number of components is now 9 ``` Dimension ExpAccumCnt_nx differs 9 /= 8 Dimension ImpAccumCnt_nx differs 9 /= 8 ``` All other fields in all Restarts (ATM, ICE, OCN) are B4B for the current top of ufs-weather except this difference in the CMEPS restart file. Testing performed if application target is UFS-HAFS: - [ ] (recommended) UFS-HAFS testing - description: - details (e.g. failed tests): Hashes used for testing: - [ ] CESM: - repository to check out: https://github.com/ESCOMP/CESM.git - branch: - hash: - [X ] UFS-coupled, then umbrella repostiory to check out and associated hash: - repository to check out: https://github.com/ufs-community/ufs-weather-model - branch:develop - hash: 177ea10 - [ ] UFS-HAFS, then umbrella repostiory to check out and associated hash: - repository to check out: - branch: - hash: commit b5b67e4acd29f3f72921e7e22f319ae35f961716 Merge: 4736b97 d865106 Author: jedwards4b <[email protected]> Date: Thu Jun 10 13:01:52 2021 -0600 Merge pull request #193 from jedwards4b/add_stop_option_date add support for stop_option date ### Description of changes Add support to esm_time_mod.F90 for stop option 'date'. Change some ESMF log info messages to esmf log error. ### Specific notes Contributors other than yourself, if any: …

billsacks added 3 commits July 7, 2021 15:41

Add an atm->lnd Sa_o3 field

a375d99

Add atm_ozone_frequency drv_flds_in namelist variable

cf3dc8f

Remove valid values for atm_ozone_frequency

66887b7

The code to parse this value will live in a different repository (in the share code), so it would be annoying to have the valid values here: if a new valid value is added, changes would be needed here in addition to the share code.

billsacks requested review from mvertens and fvitt July 15, 2021 23:17

billsacks commented Jul 15, 2021

View reviewed changes

billsacks mentioned this pull request Jul 15, 2021

Add module to read ozone_coupling_nl ESCOMP/CESM_share#4

Merged

fvitt reviewed Jul 16, 2021

View reviewed changes

Fix Sa_o3 description

1e7b398

mvertens approved these changes Jul 20, 2021

View reviewed changes

Use mol/mol for units of Sa_o3

74d3692

Based on input in ESCOMP/CAM#404

Merge remote-tracking branch 'origin/master' into pass_ozone

b61dff4

Resolved Conflicts: mediator/esmFldsExchange_cesm_mod.F90

mvertens merged commit ec8fd6b into ESCOMP:master Aug 10, 2021

billsacks deleted the pass_ozone branch August 10, 2021 02:39

billsacks mentioned this pull request Mar 26, 2022

Receive ozone from atmosphere ESCOMP/CTSM#270

Open

9 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add ozone field from atm -> lnd #212

Add ozone field from atm -> lnd #212

billsacks commented Jul 15, 2021

billsacks commented Jul 15, 2021

billsacks Jul 15, 2021

fvitt Jul 16, 2021

billsacks Jul 19, 2021

fvitt Jul 19, 2021

mvertens Jul 20, 2021

fvitt Jul 16, 2021

billsacks Jul 19, 2021

mvertens Jul 20, 2021

mvertens commented Jul 26, 2021

billsacks commented Jul 26, 2021

danicalombardozzi commented Jul 28, 2021

billsacks commented Jul 28, 2021

billsacks commented Aug 9, 2021

billsacks commented Aug 9, 2021

billsacks commented Aug 10, 2021

Add ozone field from atm -> lnd #212

Add ozone field from atm -> lnd #212

Conversation

billsacks commented Jul 15, 2021

Description of changes

Specific notes

billsacks commented Jul 15, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mvertens commented Jul 26, 2021

billsacks commented Jul 26, 2021

danicalombardozzi commented Jul 28, 2021

billsacks commented Jul 28, 2021

billsacks commented Aug 9, 2021

billsacks commented Aug 9, 2021

billsacks commented Aug 10, 2021