Skip to content

Feature/changefldnames #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MinsukJi-NOAA merged 25 commits into from
Feb 27, 2020
Merged

Feature/changefldnames #29

Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
95f9ac3
Merge pull request #1 from NOAA-EMC/develop
DeniseWorthen Oct 4, 2019
39b5e91
Merge pull request #2 from NOAA-EMC/develop
DeniseWorthen Nov 23, 2019
eb563f4
Merge pull request #5 from NOAA-EMC/develop
DeniseWorthen Jan 1, 2020
fbfb3df
remove ice-ocean merge in prep_atm
DeniseWorthen Jan 11, 2020
584c900
Merge pull request #8 from NOAA-EMC/develop
DeniseWorthen Jan 16, 2020
a50e0d9
Merge branch 'develop' into feature/nomerge2atm
DeniseWorthen Jan 16, 2020
7110838
remove atm-ocn in prep_atm;remove associated FBs
DeniseWorthen Jan 27, 2020
8e4187e
comment vs ifdef
DeniseWorthen Jan 27, 2020
c3fe0c1
remove unnecessary prep_atm merges
DeniseWorthen Jan 27, 2020
ca2677c
remove custom merges in prep_atm which are not needed when
DeniseWorthen Jan 31, 2020
8327230
Merge remote-tracking branch 'origin/feature/remove_unused' into feat…
DeniseWorthen Feb 3, 2020
42075ce
move sum(weights) into datm part of loop; add wgtp01 for netLW
DeniseWorthen Feb 3, 2020
a7daedf
remove unused code in prep_atm
DeniseWorthen Feb 4, 2020
42aae56
Merge remote-tracking branch 'origin/feature/aofluxes' into feature/c…
DeniseWorthen Feb 4, 2020
793b2e4
use RWFields_tile for mediator dumps
DeniseWorthen Feb 5, 2020
c030896
clean up commented out code used for testing
DeniseWorthen Feb 6, 2020
c8a3c1b
add print statement of slow and fast counters for field dumping
DeniseWorthen Feb 7, 2020
6acefa8
more PET log info printout
DeniseWorthen Feb 7, 2020
d3ad0c5
add ability to write mediator a-o fluxes to file with statewrite_flag
DeniseWorthen Feb 9, 2020
5923739
return statewrite flags to their default setting
DeniseWorthen Feb 10, 2020
fd0cd69
mediator aborts if a required mediator restart
DeniseWorthen Feb 16, 2020
16cc11a
add condition of 'not coldstart' to mediator abort
DeniseWorthen Feb 16, 2020
101d109
change sw field names from cice
DeniseWorthen Feb 16, 2020
8defb2f
Merge pull request #15 from DeniseWorthen/feature/changefldnamescice
DeniseWorthen Feb 19, 2020
48debb8
Add capablilty to build the CMEPS mediator in place of the
DeniseWorthen Feb 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion src/module_EARTH_GRID_COMP.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,7 +1318,51 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG)
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_vis_dir_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_vis_dir_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_vis_dif_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_vis_dif_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_ir_dir_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_ir_dir_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"mean_sw_pen_to_ocn_ir_dif_flx")) then
call NUOPC_FieldDictionaryAddEntry( &
standardName="mean_sw_pen_to_ocn_ir_dif_flx", &
canonicalUnits="W m-2", &
rc=rc)
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
line=__LINE__, &
file=__FILE__)) &
return ! bail out
endif
if (.not. NUOPC_FieldDictionaryHasEntry( &
"inst_ir_dir_albedo")) then
call NUOPC_FieldDictionaryAddEntry( &
Expand Down
Loading