new water and energy budget diagnostics #107

jedwards4b · 2020-09-30T13:54:29Z

Description of changes

Adds budget diagnostics code to cmeps.

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):

(required) CIME_DRIVER=nuopc scripts_regression_tests.py
- machines: cheyenne
- details (e.g. failed tests):
(required) 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):

Testing performed if application target is UFS-S2S:

(required) UFS-S2S testing
- description:
- details (e.g. failed tests):

Hashes used for testing:

CESM:
- repository to check out: https://github.com/ESCOMP/CESM.git
- branch: nuopc_dev
- hash: 41ef9c4
UFS-S2S, then umbrella repostiory to check out and associated hash:
- repository to check out:
- branch:
- hash:

jedwards4b · 2020-10-07T19:51:08Z

Note that this PR removes variables aoflux_grid and gust_fac, these variables are not currently being used but may have been intended as placeholders for future development.

mvertens

I'd like to review again once my comments have been addressed. The biggest one is that the med_time_mod.F90 should be from master and not what was in the original diag branch.

mvertens · 2020-09-30T15:21:16Z

cime_config/runseq/runseq_general.py

+        runseq.add_action("MED med_phases_diag_lnd"                , run_lnd and diag_mode)
+        runseq.add_action("MED med_phases_diag_rof"                , run_rof and diag_mode)
+        runseq.add_action("MED med_phases_diag_ocn"                , run_ocn and diag_mode)
+        runseq.add_action("MED med_phases_diag_glc"        , run_glc and diag_mode)


This is really picky - but can yo please keep the indents where they have been placed originally.

mvertens · 2020-09-30T15:22:29Z

mediator/esmFldsExchange_cesm_mod.F90

@@ -679,7 +679,7 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
          call addfld(fldListFr(compice)%flds, 'Faii_'//trim(suffix(n)))
          call addfld(fldListTo(compatm)%flds, 'Faxx_'//trim(suffix(n)))
       else
-          ! (non aqua-planet)
+          ! CESM (non aqua-planet)


This is okay - but we don't really need the CESM comment since this code section is already in a CESM specific routine.

mvertens · 2020-09-30T15:23:04Z

mediator/esmFldsExchange_cesm_mod.F90

@@ -692,7 +692,6 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
                  mrg_from2=compice, mrg_fld2='Faii_'//trim(suffix(n)), mrg_type2='merge', mrg_fracname2='ifrac', &
                  mrg_from3=compmed, mrg_fld3='Faox_'//trim(suffix(n)), mrg_type3='merge', mrg_fracname3='ofrac')

-          ! (cam, aqua-planet)


Why did you get rid of this comment?

mediator/med.F90

mvertens · 2020-10-07T20:45:52Z

mediator/med.F90

+      call set_stop_alarm(gcomp, rc)
+      if (ChkErr(rc,__LINE__,u_FILE_u)) return
+


Why are we calling this new routine? Why is this needed?

mvertens · 2020-10-07T20:48:50Z

mediator/med_fraction_mod.F90

+    type(ESMF_RouteHandle)     :: rh_ocn2atm
+    type(ESMF_RouteHandle)     :: rh_lnd2atm
+    type(ESMF_RouteHandle)     :: rh_atm2lnd
+    integer                    :: srcTermProcessing_Value = 0


Did you bring in my changes from PR #110 into this? These variables are not in my PR branch. So I don't know what you are actually using.

mvertens · 2020-10-07T20:49:45Z

mediator/med_fraction_mod.F90

+    type(ESMF_Field)           :: fldsrc
+    type(ESMF_Field)           :: flddst


The same comment as above applies. These variables are not in my PR branch.

mvertens · 2020-10-07T20:50:28Z

mediator/med_map_mod.F90

@@ -105,6 +105,7 @@ subroutine med_map_RouteHandles_init_esmflds(gcomp, llogunit, rc)
    use ESMF  , only : ESMF_REGRIDMETHOD_NEAREST_STOD
    use ESMF  , only : ESMF_NORMTYPE_DSTAREA, ESMF_REGRIDMETHOD_PATCH, ESMF_RouteHandlePrint
    use NUOPC , only : NUOPC_Write
+    use shr_sys_mod, only : shr_sys_abort


Why is this needed? We should be using an ESMF error exit statement.

mvertens · 2020-10-07T20:51:33Z

mediator/med_time_mod.F90

+       optNStep          = "nstep"     , &
       optNSeconds       = "nseconds"  , &
+       optNSecond        = "nsecond"   , &
       optNMinutes       = "nminutes"  , &
+       optNMinute        = "nminute"   , &
       optNHours         = "nhours"    , &
+       optNHour          = "nhour"     , &
       optNDays          = "ndays"     , &
+       optNDay           = "nday"      , &
       optNMonths        = "nmonths"   , &
+       optNMonth         = "nmonth"    , &
       optNYears         = "nyears"    , &
+       optNYear          = "nyear"     , &
       optMonthly        = "monthly"   , &
       optYearly         = "yearly"    , &
       optDate           = "date"      , &
+       optIfdays0        = "ifdays0"   , &


Why add these back in. We should be using the code in cmeps master and not this older code. I explicitly took these out between the original diag branch and the current master.

mvertens · 2020-10-07T20:52:02Z

mediator/med_time_mod.F90

+!===============================================================================
+
+  subroutine med_time_clockInit(ensemble_driver, esmdriver, logunit, rc)
+
+    ! input/output variables
+    type(ESMF_GridComp)  :: ensemble_driver, esmdriver
+    integer, intent(in)  :: logunit
+    integer, intent(out) :: rc
+
+    ! local variables
+    type(ESMF_Clock)        :: clock
+    type(ESMF_VM)           :: vm
+    type(ESMF_Time)         :: StartTime           ! Start time
+    type(ESMF_Time)         :: RefTime             ! Reference time
+    type(ESMF_Time)         :: CurrTime            ! Current time
+    type(ESMF_Time)         :: StopTime            ! Stop time
+    type(ESMF_Time)         :: StopTime1           ! Stop time
+    type(ESMF_Time)         :: StopTime2           ! Stop time
+    type(ESMF_Time)         :: Clocktime           ! Loop time
+    type(ESMF_TimeInterval) :: TimeStep            ! Clock time-step
+    type(ESMF_Alarm)        :: alarm_stop          ! alarm
+    type(ESMF_Alarm)        :: alarm_datestop      ! alarm
+    integer                 :: ref_ymd             ! Reference date (YYYYMMDD)
+    integer                 :: ref_tod             ! Reference time of day (seconds)
+    integer                 :: start_ymd           ! Start date (YYYYMMDD)
+    integer                 :: start_tod           ! Start time of day (seconds)
+    integer                 :: curr_ymd            ! Current ymd (YYYYMMDD)


med_time_mod should be from master and not what you have here. This is older code that is no longer needed.

jedwards4b · 2020-10-07T21:52:56Z

@mvertens I think that I've captured all of your suggested changes. I will restart testing.

mvertens · 2020-10-07T22:02:09Z

@jedwards4b - thank you. That sounds great.

…

On Wed, Oct 7, 2020 at 3:53 PM jedwards4b ***@***.***> wrote: @mvertens <https://github.com/mvertens> I think that I've captured all of your suggested changes. I will restart testing. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#107 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AB4XCE56R4I27MGAXOV2OGLSJTPMNANCNFSM4R7D7DKA> .

-- Mariana Vertenstein CESM Software Engineering Group Head National Center for Atmospheric Research Boulder, Colorado Office 303-497-1349 Email: [email protected]

jedwards4b · 2020-10-14T21:50:06Z

cime_config/buildexe

@@ -83,9 +83,10 @@ def _main_func():

    with open(os.path.join(bld_root,'Filepath'), 'w') as out:
        cmeps_dir = os.path.join(os.path.dirname(__file__), os.pardir)
+        # SourceMods dir needs to be first listed
+        out.write(os.path.join(caseroot, "SourceMods", "src.drv") + "\n")


This is a bug fix not related to diags - the SourceMods dir needs to be first in Filepath

jedwards4b · 2020-10-14T21:59:52Z

cime_config/testdefs/testlist_drv.xml

@@ -165,6 +165,14 @@
      <option name="wallclock"> 00:40:00 </option>
    </options>
  </test>
+  <test compset="B1850" grid="f19_g16" name="ERR_Vnuopc_Ld5" testmods="allactive/nuopc_cap_io">


Add a B1850 test

jedwards4b · 2020-10-15T14:42:09Z

@mvertens All tests pass, please review and merge.

… air-sea flux computation (ESCOMP#107) * Update ufs/ccpp/data/MED_typedefs.meta.

jedwards4b marked this pull request as draft September 30, 2020 13:54

Mariana Vertenstein and others added 9 commits October 7, 2020 09:24

addition of water and energy global diagnostics

298f84f

changes to get budgets working

861e925

bug fixes and updates for cism

a74c389

update of mvertens/newdiags

cf5da28

budget development

9f697d5

remove unused prevtime

fb8b42d

add ocn budget for A compset

3515c71

budget improvements

91fccdc

remove debug print statement

ee63d5c

jedwards4b force-pushed the jedwards/newdiags branch from 6ca9a8b to ee63d5c Compare October 7, 2020 15:33

jedwards4b added 7 commits October 7, 2020 09:49

add netcdf to required for cmake

04cf4d5

fix netcdf case in cmake

1fec2df

fix github build

2b9a741

fix github build

c9a6b4e

fix github build

9e59f18

fix github build

263870e

fix github build

a9fc73a

jedwards4b requested a review from mvertens October 7, 2020 17:10

jedwards4b self-assigned this Oct 7, 2020

jedwards4b marked this pull request as ready for review October 7, 2020 19:49

jedwards4b mentioned this pull request Oct 7, 2020

variables aoflux_grid and gust_fac #111

Open

mvertens changed the title ~~Jedwards/newdiags~~ new water and energy budget diagnostics Oct 7, 2020

mvertens reviewed Oct 7, 2020

View reviewed changes

jedwards4b added 3 commits October 7, 2020 15:23

use master med_time_mod, remove shr_sys_abort

6d1ebac

remove netcdf requirement from cmake build

0a28273

clean up wrt master

c70410f

jedwards4b and others added 6 commits October 7, 2020 16:03

add back mesh_info

88bd1f7

add back mesh_info

c7cdf6a

more cleanup wrt master

9067ce0

fixed problem with stop alarm initialization

118db68

add B1850 test, list SourceMods dir first in build

7165848

fix diags for c case

d390f6c

jedwards4b commented Oct 14, 2020

View reviewed changes

mvertens merged commit 96684bc into master Oct 15, 2020

mvertens deleted the jedwards/newdiags branch October 29, 2020 16:58

uturuncoglu pushed a commit to uturuncoglu/CMEPS that referenced this pull request Feb 1, 2024

Update ccpp-physics in CMEPS to consider sea surface ocean current in…

a312c64

… air-sea flux computation (ESCOMP#107) * Update ufs/ccpp/data/MED_typedefs.meta.

BinLiu-NOAA pushed a commit to hafs-community/CMEPS that referenced this pull request Feb 1, 2024

Update ccpp-physics in CMEPS to consider sea surface ocean current in…

8cd4a32

… air-sea flux computation (ESCOMP#107) * Update ufs/ccpp/data/MED_typedefs.meta.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

new water and energy budget diagnostics #107

new water and energy budget diagnostics #107

jedwards4b commented Sep 30, 2020 •

edited

Loading

jedwards4b commented Oct 7, 2020

mvertens left a comment

mvertens Sep 30, 2020

mvertens Sep 30, 2020

mvertens Sep 30, 2020

mvertens Oct 7, 2020

mvertens Oct 7, 2020

mvertens Oct 7, 2020

mvertens Oct 7, 2020

mvertens Oct 7, 2020

mvertens Oct 7, 2020

jedwards4b commented Oct 7, 2020

mvertens commented Oct 7, 2020 via email

jedwards4b Oct 14, 2020

jedwards4b Oct 14, 2020

jedwards4b commented Oct 15, 2020

		call set_stop_alarm(gcomp, rc)
		if (ChkErr(rc,__LINE__,u_FILE_u)) return

new water and energy budget diagnostics #107

new water and energy budget diagnostics #107

Conversation

jedwards4b commented Sep 30, 2020 • edited Loading

Description of changes

Specific notes

jedwards4b commented Oct 7, 2020

mvertens left a 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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jedwards4b commented Oct 7, 2020

mvertens commented Oct 7, 2020 via email

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jedwards4b commented Oct 15, 2020

jedwards4b commented Sep 30, 2020 •

edited

Loading