Update NUOPC/CMEPS driver #607

DeniseWorthen · 2021-06-11T15:28:31Z

For detailed information about submitting Pull Requests (PRs) to the CICE-Consortium,
please refer to: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index#information-for-developers

PR checklist

Code changes are confined to drivers/nuopc/cmeps with the exceptions of making makemask public in
cicecore/cicedynB/infrastructure/ice_grid.F90 and minor changes need in ice_init for CESM
adds drivers/nuopc/cmeps updates from ESCOMP including introduction of mask file for generating mask when appropriate and changes that allow cice6 to run as an external cesm component
makes changes in drivers/nuopc/cmeps required for new time manager and introduces a run configurable mesh tolerance error for ufs-weather
removes forapps/ufs subdirectory which is no longer required by ufs-weather

These changes are B4B when tested against the current develop branch of ufs-weather-model (00d570e). Tested configurations for ufs-weather-model include multiple configurations, e.g. a fully active atmosphere (UFSAtm) or a data atmosphere (CDEPS, NEMSDatm) coupled to MOM6 or MOM6+WW3 using the CMEPS mediator. Tests are conducted primarily for different ATM physics options and restart reproducibility of the coupled system. Tested resolutions are C96 ATM
and 1deg OCN+ICE, C192 ATM and 1/2deg OCN+ICE and C384 ATM and 1/4 deg OCN+ICE. Both Intel and GNU compilers are tested for the coupled system.

* Isotopes for CICE (CICE-Consortium#423) Co-authored-by: apcraig <anthony.p.craig@gmail.com> Co-authored-by: David Bailey <dbailey@ucar.edu> Co-authored-by: Elizabeth Hunke <eclare@lanl.gov>

Update CICE for coupling with UFS

… nuopc

…l temperature and density are satisfied

changes to satisfy ufsatm and cesm requirements for pot temp and density from atm

* Add atmiter_conv to CICE * Add documentation * trigger build the docs Co-authored-by: David A. Bailey <dbailey@ucar.edu>

This reverts commit e70d1ab.

… nuopc

…p_scol

…ap_escomp_scol

dabail10 · 2021-06-11T15:32:25Z

cicecore/cicedynB/general/ice_init.F90

@@ -452,6 +450,8 @@ subroutine input_data
 #ifndef CESMCOUPLED
      runid   = 'unknown'   ! run ID used in CESM and for machine 'bering'
      runtype = 'initial'   ! run type: 'initial', 'continue'
+      restart = .false.      ! if true, read restart files for initialization


Note that this is needed because CESM has restart flags set by driver.

dabail10 · 2021-06-11T15:33:18Z

cicecore/cicedynB/general/ice_init.F90

@@ -1775,7 +1775,7 @@ subroutine input_data
          grid_type  /=  'rectangular'    .and. &
          grid_type  /=  'cpom_grid'      .and. &
          grid_type  /=  'regional'       .and. &
-          grid_type  /=  'latlon' ) then
+          grid_type  /=  'setmask' ) then


The latlon grid functionality has changed here. We are using a new NUOPC mesh functionality. Are there other groups that use the 'latlon' grid?

We need to keep the latlon capability. F cases use the latlon feature in prescribed ice mode, I assume there may be other users of older version of CESM that need this. RASM certainly does.

I didn't realize that RASM still did F compsets! We can certainly keep this. I can make this modification.

dabail10 · 2021-06-11T15:33:44Z

cicecore/cicedynB/infrastructure/ice_grid.F90

@@ -40,7 +40,7 @@ module ice_grid
      private
      public :: init_grid1, init_grid2, &
                t2ugrid_vector, u2tgrid_vector, &
-                to_ugrid, to_tgrid, alloc_grid
+                to_ugrid, to_tgrid, alloc_grid, makemask


makemask is needed in the driver code

dabail10 · 2021-06-11T15:34:06Z

cicecore/cicedynB/infrastructure/ice_grid.F90

@@ -379,11 +379,6 @@ subroutine init_grid2
         else
            call popgrid        ! read POP grid lengths directly
         endif 
-#ifdef CESMCOUPLED
-      elseif (trim(grid_type) == 'latlon') then


Again, is anyone else using latlongrid?

dabail10

There are only two non-driver routines impacted here: ice_init.F90 and ice_grid.F90. I have added comments as a part of the review here. Otherwise, everything else is needed for running the NOAA/EMC UFS app and the CESM.

apcraig

I think this can be merged after the lonlat mode is recovered.

dabail10 · 2021-06-15T15:56:22Z

@DeniseWorthen can you do this? I'm not sure I can modify your pull request.

phil-blain · 2021-06-15T15:59:11Z

I think this can be merged after the lonlat mode is recovered.

It would be nice however if the merge message would be tweaked to not include the concatenated messages from the 131(!) commits in this PR (which is the default for squash merges)...

eclare108213

I'm fine with the changes to ice_init.F90 and ice_grid.F90. Someone else should review the nuopc mods.

* advance_timestep calls calendar; calling calendar a second time results in hour always being equal to hourp and new_hour is always false and no hourly history is produced

DeniseWorthen · 2021-06-16T21:33:58Z

@apcraig With further testing, I think I'm seeing the same behaviour as reported in issue 589. Our use case is with the following:

    histfreq       = 'm','d','h','x','x'
    histfreq_n     =  0 , 0 , 6 , 1 , 1
    hist_avg       = .true.

However, I am getting hourly history files instead of the expected 6-hourly files. It seems elapsed_hours is 0 (until the start of a new day) so that mod(elapsed_hours,histfreq_n(ns)) is always 0, and write_history is true for each new_hour.

apcraig · 2021-06-16T21:49:27Z

@DeniseWorthen, sorry about the hourly output issue. This is something I could/should have fixed by now, but I thought we'd quickly settle questions about relative vs absolute frequency. I will fix this soon. If this is critical for you, let me know and I'll make it even higher priority. Thanks!

apcraig · 2021-06-16T21:50:47Z

Just a final checkin @DeniseWorthen, is this ready to merge from your side of things?

DeniseWorthen · 2021-06-16T22:26:41Z

@apcraig We would need to get it fixed prior to the next evaluation we're preparing for the coupled model, but it will be a few weeks before we're ready to run the entire set. Until then, we can make do w/ hourly output. I think it is ready to merge. Thanks.

DeniseWorthen and others added 30 commits February 25, 2020 08:43

Merge pull request #1 from CICE-Consortium/master

0338d04

Merge pull request #2 from CICE-Consortium/master

99470ed

Merge pull request NOAA-EMC#3 from CICE-Consortium/master

71d2ded

merge latest master (NOAA-EMC#4)

d46d691

* Isotopes for CICE (CICE-Consortium#423) Co-authored-by: apcraig <anthony.p.craig@gmail.com> Co-authored-by: David Bailey <dbailey@ucar.edu> Co-authored-by: Elizabeth Hunke <eclare@lanl.gov>

updated orbital calculations needed for cesm

183218a

fixed problems in updated orbital calculations needed for cesm

10e7c20

update CICE6 to support coupling with UFS

ce8e5a9

Merge pull request #2 from apcraig/ufs01

8f0b5ee

Update CICE for coupling with UFS

Merge pull request #1 from ESCOMP/nuopc

7ac0e3d

Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…

80c9e6e

… nuopc

put in changes so that both ufsatm and cesm requirements for potentia…

53715ea

…l temperature and density are satisfied

Merge pull request NOAA-EMC#3 from mvertens/mvertens/nuopc

7e43703

changes to satisfy ufsatm and cesm requirements for pot temp and density from atm

Merge remote-tracking branch 'upstream/master'

397e588

Convergence on ustar for CICE. (CICE-Consortium#452) (NOAA-EMC#5)

3bb3694

* Add atmiter_conv to CICE * Add documentation * trigger build the docs Co-authored-by: David A. Bailey <dbailey@ucar.edu>

Merge remote-tracking branch 'upstream/nuopc' into HEAD

f41f1e9

update icepack submodule

e70d1ab

Revert "update icepack submodule"

308a1d4

This reverts commit e70d1ab.

Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…

7848fdf

… nuopc

Merge remote-tracking branch 'upstream/nuopc' into HEAD

6982ee4

update comp_ice.backend with temporary ice_timers fix

089f60f

Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…

6affdcf

… nuopc

Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…

b5a6058

… nuopc

Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

415df0e

Merge branch 'master' of https://github.com/CICE-Consortium/CICE into…

b4da8a6

… nuopc

Merge branch 'nuopc' of https://github.com/ESCOMP/CICE into nuopc

239c7de

Fix threading problem in init_bgc

ad03424

Fix additional OMP problems

73e7774

changes for coldstart running

46fcfba

Move the forapps directory

c762336

remove cesmcoupled ifdefs

6bccf71

DeniseWorthen and others added 8 commits June 10, 2021 08:08

remove ufs/comp_ice.backend scripts

7f34d46

Merge remote-tracking branch 'escomp/nuopc' into feature/updcap_escom…

b628606

…p_scol

point submodule for icepack to consortium/icepack

3d94c9e

add cice changes for zlvs (NOAA-EMC#29)

9d88d92

Merge remote-tracking branch 'upstream/emc/develop' into feature/updc…

aa11007

…ap_escomp_scol

resolve white space differences

a0f83fe

Merge remote-tracking branch 'upstream/emc/develop' into emc/develop

d1f2d15

Merge branch 'emc/develop' into feature/updcap_escomp_scol

d09c4ce

dabail10 reviewed Jun 11, 2021

View reviewed changes

dabail10 approved these changes Jun 11, 2021

View reviewed changes

dabail10 requested review from eclare108213 and apcraig June 11, 2021 15:36

DeniseWorthen mentioned this pull request Jun 11, 2021

Update CICE Cap NOAA-EMC/CICE#30

Closed

apcraig requested changes Jun 15, 2021

View reviewed changes

revert removal of 'latlon' grid_type

1900861

eclare108213 approved these changes Jun 15, 2021

View reviewed changes

remove extraneous call to calendar in CICE_RunMod

9df592e

* advance_timestep calls calendar; calling calendar a second time results in hour always being equal to hourp and new_hour is always false and no hourly history is produced

apcraig approved these changes Jun 16, 2021

View reviewed changes

apcraig added the Drivers/coupling label Jun 17, 2021

apcraig merged commit ff88891 into CICE-Consortium:master Jun 17, 2021

DeniseWorthen deleted the feature/updcap_escomp_scol branch November 26, 2021 14:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update NUOPC/CMEPS driver #607

Update NUOPC/CMEPS driver #607

DeniseWorthen commented Jun 11, 2021 •

edited

Loading

dabail10 Jun 11, 2021

dabail10 Jun 11, 2021

apcraig Jun 11, 2021

dabail10 Jun 11, 2021

dabail10 Jun 11, 2021

dabail10 Jun 11, 2021

dabail10 left a comment

apcraig left a comment

dabail10 commented Jun 15, 2021

phil-blain commented Jun 15, 2021

eclare108213 left a comment

DeniseWorthen commented Jun 16, 2021

apcraig commented Jun 16, 2021

apcraig commented Jun 16, 2021

DeniseWorthen commented Jun 16, 2021

Update NUOPC/CMEPS driver #607

Update NUOPC/CMEPS driver #607

Conversation

DeniseWorthen commented Jun 11, 2021 • edited Loading

PR checklist

dabail10 Jun 11, 2021

Choose a reason for hiding this comment

dabail10 Jun 11, 2021

Choose a reason for hiding this comment

apcraig Jun 11, 2021

Choose a reason for hiding this comment

dabail10 Jun 11, 2021

Choose a reason for hiding this comment

dabail10 Jun 11, 2021

Choose a reason for hiding this comment

dabail10 Jun 11, 2021

Choose a reason for hiding this comment

dabail10 left a comment

Choose a reason for hiding this comment

apcraig left a comment

Choose a reason for hiding this comment

dabail10 commented Jun 15, 2021

phil-blain commented Jun 15, 2021

eclare108213 left a comment

Choose a reason for hiding this comment

DeniseWorthen commented Jun 16, 2021

apcraig commented Jun 16, 2021

apcraig commented Jun 16, 2021

DeniseWorthen commented Jun 16, 2021

DeniseWorthen commented Jun 11, 2021 •

edited

Loading