Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Remove interstitial variables for land and ice emissivity and update the land and ice emissivity in the routine setemis in CCPP #393

Merged
merged 341 commits into from
Oct 22, 2021
Merged
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
341 commits
Select commit Hold shift + click to select a range
a7a306c
replacing post_gfs.F90 with develop version - note that this will NOT…
SMoorthi-emc Jul 27, 2020
69f4033
syncing submodule ccpp-physics
SMoorthi-emc Jul 28, 2020
6fb21f1
fixing issues related to z0 and restart reproducibility
SMoorthi-emc Aug 3, 2020
51cce85
after submodule sync
SMoorthi-emc Aug 3, 2020
5ed5b09
Merge remote-tracking branch 'upstream/develop' into SM_Jul302020
SMoorthi-emc Aug 3, 2020
7cb03c4
changing post_gfs back to the version that works with double moment m…
SMoorthi-emc Aug 4, 2020
7c258bd
changing z0ice to cm
SMoorthi-emc Aug 4, 2020
a77396a
changing z0ice to cm
SMoorthi-emc Aug 4, 2020
1f35918
after merging with fv3atm/develop updated with rrtmgp
SMoorthi-emc Aug 9, 2020
0e66037
after updating sfcsub.F in ccpp-physics
SMoorthi-emc Aug 10, 2020
e0b7e37
a fix in wv_saturation.F - impact on resuls
SMoorthi-emc Aug 10, 2020
956d06b
moving definition of kp inside ifdef in wv_saturation.F
SMoorthi-emc Aug 10, 2020
ee2a35f
updating gitmodules
SMoorthi-emc Aug 11, 2020
bef4b5e
Merge remote-tracking branch 'origin/SM_Jul302020' into SM_Aug032020
SMoorthi-emc Aug 11, 2020
515308e
changing ver=3 to ver=4 in suite_FV3_GFS_cpld_rasmgshocnsst.xml
SMoorthi-emc Aug 24, 2020
824b634
updatin gitmodules
SMoorthi-emc Aug 26, 2020
14922da
after merging with fv3atm/develop
SMoorthi-emc Aug 26, 2020
697ad6b
updating .gitmodules
SMoorthi-emc Aug 31, 2020
e9ef747
fix some tsfc related issues
SMoorthi-emc Sep 1, 2020
70dc9b8
creating a new brnach for restart fix PR
SMoorthi-emc Sep 3, 2020
635dc96
after merging with fv3atm/develop
SMoorthi-emc Sep 3, 2020
445e5d3
fixing a compilation bug
SMoorthi-emc Sep 4, 2020
26887d6
replacing post_gfs.F90 by fv3atm/develop version
SMoorthi-emc Sep 4, 2020
9c98799
updating FV3GFS_io.F90 to retain original code for cold start
SMoorthi-emc Sep 5, 2020
5a48385
copy of branch SM_Sep022020 with my version of post_gfs.F90
SMoorthi-emc Sep 6, 2020
8622044
adding a new suite
SMoorthi-emc Sep 9, 2020
5402739
updating .gitmodules and some fix in FV3GFS_io
SMoorthi-emc Sep 11, 2020
299db51
Merge remote-tracking branch 'upstream/develop' into SM_Sep162020
SMoorthi-emc Sep 16, 2020
7e2cfe8
after gitmoduel sync
SMoorthi-emc Sep 22, 2020
6390ec7
after syncing submodules
SMoorthi-emc Sep 25, 2020
96ff0b5
Merge branch 'SM_Sep162020' of https://github.com/SMoorthi-emc/fv3atm…
SMoorthi-emc Sep 25, 2020
71e21ba
after merging with NOAA=EMC/fv3atm/develop
SMoorthi-emc Sep 28, 2020
ef3a010
after merging with develop of fv3atm
SMoorthi-emc Oct 1, 2020
6a6f1b1
after merging with fv3atm/develop
SMoorthi-emc Oct 12, 2020
4024b7e
updating submodules
SMoorthi-emc Oct 14, 2020
11e459b
updates to IPD
SMoorthi-emc Oct 27, 2020
8580585
some minor update in physics driver
SMoorthi-emc Oct 27, 2020
24b7647
adding a clean phys driver
SMoorthi-emc Oct 28, 2020
fd60abf
updating mg3 and using wfrac in ipd
SMoorthi-emc Oct 29, 2020
87583c8
some updates in IPD driver
SMoorthi-emc Nov 7, 2020
9507f7e
fixing something related to ipd
SMoorthi-emc Nov 10, 2020
4eacf6a
adding two v17 suites with ras
SMoorthi-emc Nov 10, 2020
a316a78
adding SDF suite_FV3_GFS_v17_cpldnsstsas.xml
SMoorthi-emc Nov 12, 2020
915d21f
some minor updates
SMoorthi-emc Nov 14, 2020
6602b69
adding some v17 SDFs
SMoorthi-emc Nov 14, 2020
3e344f0
commenting a line in fv3gfs_io and a minot update in gcycle
SMoorthi-emc Nov 16, 2020
99793e1
some updates to io and physics driver
SMoorthi-emc Nov 19, 2020
d402518
after merging with fv3atm/develop on Nov19,2020
SMoorthi-emc Nov 20, 2020
9d4fe97
updating some SDFs
SMoorthi-emc Nov 26, 2020
087a1ce
Merge branch 'SM_Oct102020' into SMNov202020
SMoorthi-emc Nov 27, 2020
5515b60
after suncing submodules
SMoorthi-emc Nov 29, 2020
c053735
updating the IPD side to change iovr_sw and iovr_lw to just iovr - th…
SMoorthi-emc Dec 2, 2020
9407206
adding my version of post_gfs
SMoorthi-emc Dec 2, 2020
8d51e02
after merging with develop on Dec02
SMoorthi-emc Dec 3, 2020
20a31c4
some update to snow depth calculation and output
SMoorthi-emc Dec 4, 2020
8d9ce62
some update to physics driver
SMoorthi-emc Dec 5, 2020
71a5e23
fixing a bug
SMoorthi-emc Dec 9, 2020
bf81a67
after syncing submodules
SMoorthi-emc Dec 11, 2020
467a538
reveerting to my version of post_gfs
SMoorthi-emc Dec 17, 2020
34b2202
minor update to FV3GFS_io and ipd physics driver to be consistent wit…
SMoorthi-emc Dec 22, 2020
2be9274
after merging with fv3atm/develop on Dec 22
SMoorthi-emc Dec 22, 2020
27dacbc
after updating ccpp for nsst error in tranferring code from IPD - err…
SMoorthi-emc Dec 23, 2020
31d40d3
after mergint with fv3atm/develop on Jan04
SMoorthi-emc Jan 5, 2021
c6039db
after submodule sync
SMoorthi-emc Jan 5, 2021
b162993
reverting th unit for showd
SMoorthi-emc Jan 6, 2021
f348b8d
after merging with fv3atm/develop oh Jan 15
SMoorthi-emc Jan 15, 2021
f09903b
updating ccpp-physics
SMoorthi-emc Jan 20, 2021
ae60021
removing some blanksin GFS_typedefs.F90
SMoorthi-emc Jan 21, 2021
2ebd268
after merging with fv3atm/develop on Jan 28, 2021
SMoorthi-emc Jan 29, 2021
f7e588b
fixing GFS-typedef
SMoorthi-emc Jan 29, 2021
a6c09c3
make sure the f00 surface file contains ice from gfs initial state
SMoorthi-emc Jan 31, 2021
3f587ac
Merge remote-tracking branch 'upstream/develop' into SM_Feb022021
SMoorthi-emc Feb 2, 2021
481a08e
after merging with fv3atm/develop
SMoorthi-emc Feb 6, 2021
68f77cb
turning off a print in atmos_model and removing Rayleigh friction in …
SMoorthi-emc Feb 18, 2021
ecbccfa
after merging with fv3atm/develop on feb18
SMoorthi-emc Feb 19, 2021
7e93eed
after merging with fv3atm/develop on feb 19
SMoorthi-emc Feb 19, 2021
a4b144f
after merging with fv3atm/develop and changing GFS_Typedef to allow t…
SMoorthi-emc Feb 25, 2021
b378e30
after submodule sync
SMoorthi-emc Mar 2, 2021
ca6f28e
after merging with fv3atm/develop on Mar03, 2021
SMoorthi-emc Mar 3, 2021
e12ca08
fixing fscav in data/GFS_typedefs.F90
SMoorthi-emc Mar 11, 2021
7c72a49
updates to CMake from Dom
SMoorthi-emc Mar 16, 2021
3133783
after merging with NOAA-EMC/fv3atm/develop on March 16
SMoorthi-emc Mar 16, 2021
ea57b29
after merging with fv3atm/develop on March 17, 8:30PM
SMoorthi-emc Mar 18, 2021
a2b73e6
updating inline post routines to reduce post printout
SMoorthi-emc Mar 21, 2021
e7429ce
after merging with ccpp-physics/master on March 22, 2021
SMoorthi-emc Mar 22, 2021
d6da5a5
updating CMakeLists.txt to be able to compile withe SM_Mar222021 bran…
SMoorthi-emc Mar 23, 2021
7fd139c
modify atmos_model.F90 to skip stochastic physics call when not turne…
SMoorthi-emc Mar 31, 2021
6d655b6
updating .gitmodules
SMoorthi-emc Mar 31, 2021
dfeaa5d
merging with fv3atm/develop on March 31, 2021
SMoorthi-emc Apr 1, 2021
309faef
syncinc submodules
SMoorthi-emc Apr 2, 2021
e72f14b
Merge remote-tracking branch 'upstream/develop' into SM_Mar222021_GFD…
SMoorthi-emc Apr 5, 2021
5d064c1
after syncing submodules
SMoorthi-emc Apr 6, 2021
0080be7
updating .gitmodules
SMoorthi-emc Apr 6, 2021
c6066a0
after merging with fv3atm/develop on Apr09, 2021
SMoorthi-emc Apr 9, 2021
b3122d2
after merging with fv3atm/develop om April 15, 2021
SMoorthi-emc Apr 16, 2021
0c19ad9
adding zorlw line that was accidentally deleted
SMoorthi-emc Apr 16, 2021
ed1e224
updateing .gitmodules
SMoorthi-emc Apr 19, 2021
af4f5a0
after submodule sync
SMoorthi-emc Apr 20, 2021
b77094f
minor fix to io/FV4GFS_io.F90 and syncing submodules
SMoorthi-emc Apr 29, 2021
fefefea
updating ccpp-physics
SMoorthi-emc Apr 29, 2021
7e82ddc
after syncing submodules
SMoorthi-emc Apr 29, 2021
7635144
after merging with develop on April 29
SMoorthi-emc Apr 30, 2021
19d6f5b
after merging with fv3atm/ddevelop on April 30
SMoorthi-emc Apr 30, 2021
64cbf39
after merging with fv3atm/develop on April 30
SMoorthi-emc May 1, 2021
b191e00
after submodule sync
SMoorthi-emc May 4, 2021
519c9ba
adding a few new suites and removing rayleigh fomr some suites
SMoorthi-emc May 8, 2021
20c6940
Merge branch 'SM_May012021' of https://github.com/SMoorthi-emc/fv3atm…
SMoorthi-emc May 8, 2021
ba113d1
Merge remote-tracking branch 'upstream/develop' into SM_May012021
SMoorthi-emc May 10, 2021
e66901f
some comment update in GFS_typedefs.F90
SMoorthi-emc May 11, 2021
a7e6f5c
after syncing
SMoorthi-emc May 11, 2021
455b394
updating to include separate logicvals lake and use_flake, the latter…
SMoorthi-emc May 11, 2021
9b6a3ba
some cosmetic change and submodule sync
SMoorthi-emc May 12, 2021
03aadb9
after submodule sync
SMoorthi-emc May 12, 2021
789a50e
Merge remote-tracking branch 'upstream/develop' into SM_May012021
SMoorthi-emc May 12, 2021
db660af
Merge remote-tracking branch 'upstream/develop' into SM_May012021
SMoorthi-emc May 13, 2021
2c7b58b
creating a version without ncld
SMoorthi-emc May 15, 2021
8f086ab
some update to typedef removing ncld
SMoorthi-emc May 18, 2021
27835fa
after merging with fv3atm/develop on May18
SMoorthi-emc May 18, 2021
d46d238
removing Interstitial%nncl and replacing Model%ncnd
SMoorthi-emc May 18, 2021
c3083ef
after merging with fv3atm/develop on May29, 2021
SMoorthi-emc May 20, 2021
ba7a460
defining ncnd=nwat-1 and removing some commented lines in FV3GFS_io.F90
SMoorthi-emc May 20, 2021
c3ca670
fixing restart reproducibility issue associated with updated surface …
SMoorthi-emc May 27, 2021
62979c3
after merging with NOAA-EMC/fv3atm/develop on May 27, 2021
SMoorthi-emc May 27, 2021
4fa1032
chaning dynamics pointer in .gitmodules
SMoorthi-emc May 27, 2021
fa3b949
updating .gitmodules
SMoorthi-emc May 27, 2021
512b841
update gitodules
SMoorthi-emc May 27, 2021
1fd8956
putting the develop version of post files back
SMoorthi-emc May 27, 2021
094e0fc
after merging with fv3atm/develop on May28
SMoorthi-emc May 28, 2021
242af1e
fixing a bug in FV3GFS_io.F90
SMoorthi-emc May 30, 2021
7f29862
fixing an erro in FV3GFS_io.F90
SMoorthi-emc May 30, 2021
4a3b48f
adding snodi
SMoorthi-emc May 31, 2021
aabb0eb
after merging with SM_May182021_my_dynamics branch and snodi update
SMoorthi-emc Jun 2, 2021
7f5a7ef
adding snow depth and weasd over land to SfcProps and fixing some iss…
SMoorthi-emc Jun 8, 2021
e943211
Merge remote-tracking branch 'upstream/develop' into SM_May182021
SMoorthi-emc Jun 8, 2021
d0a333d
some cosmetic update
SMoorthi-emc Jun 9, 2021
0cb854d
after updating to my brnach SM_May182021
SMoorthi-emc Jun 9, 2021
fe2a841
Merge remote-tracking branch 'origin/SM_May182021' into SM_May302021
SMoorthi-emc Jun 9, 2021
b8f1575
after merging with fv3atm/develop on June10, 2021
SMoorthi-emc Jun 10, 2021
e8b08a7
Merge branch 'SM_May182021' of https://github.com/SMoorthi-emc/fv3atm…
SMoorthi-emc Jun 10, 2021
076a619
after merging with fv3atm/develop on June 14, 2021
SMoorthi-emc Jun 14, 2021
224d145
After merging with fv3atm/develop on June 14, 2021
SMoorthi-emc Jun 14, 2021
418ad47
after merging with fv3atm/develop
SMoorthi-emc Jun 16, 2021
6244800
after merging with fv3atm/develop on June 16, 2021
SMoorthi-emc Jun 16, 2021
b0f8c87
removing a blank in .gitmodules
SMoorthi-emc Jun 21, 2021
cc030ec
removing GFS_typedefs.meta_Jun07
SMoorthi-emc Jun 21, 2021
8fe65ee
after submodule sync
SMoorthi-emc Jun 21, 2021
e4e0e40
removing extra post files
SMoorthi-emc Jun 21, 2021
bcb678c
after submodule sync
SMoorthi-emc Jun 21, 2021
d8316eb
updates to stochastic_wrapper and atmos_model.F90
SMoorthi-emc Jun 23, 2021
aecb03a
removing .not. allocated from stochastic_wrapper
SMoorthi-emc Jun 23, 2021
4d9842a
fixing stochastic wrapper related issues
SMoorthi-emc Jun 25, 2021
0ff8264
some fix to mask
SMoorthi-emc Jun 30, 2021
032af80
after pulling SM_May182021 and pointing to my dynamics branch
SMoorthi-emc Jun 30, 2021
d6beb25
after merging with fv3atm/develop on July01, 2021
SMoorthi-emc Jul 2, 2021
d70280c
after merge with SM_May182021
SMoorthi-emc Jul 3, 2021
552c1d5
updating to include CICE provided ice albedo
SMoorthi-emc Jul 6, 2021
d0e2c0c
reverting post_gfs to my version as the develop version can't handle …
SMoorthi-emc Jul 9, 2021
37eb3cc
reverting chanege to calling assign_importdata in atmos_model.F90
SMoorthi-emc Jul 9, 2021
b40eb72
after merging with fv3atm/develop
SMoorthi-emc Jul 15, 2021
5a6212d
updating .gitmodule to update physics
SMoorthi-emc Jul 15, 2021
36d43e4
updated ccpp-physics
SMoorthi-emc Jul 17, 2021
ed8289d
after merging with fv3atm/develop and adding a few ugwp suites
SMoorthi-emc Jul 24, 2021
4d9cd0e
updating .gitmodules
SMoorthi-emc Jul 24, 2021
214ed42
after some fix io.F90
SMoorthi-emc Jul 26, 2021
4a6120f
changing some names to make land and ice albedos arrays consistent
SMoorthi-emc Jul 26, 2021
06fc1e5
Merge remote-tracking branch 'upstream/develop' into SM_Jul232021
SMoorthi-emc Jul 26, 2021
71a667b
adding an addtional SDF
SMoorthi-emc Jul 27, 2021
61d608a
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Jul 27, 2021
fdb3c40
changing .gitmodules to point to emc/dev version of dynamics
SMoorthi-emc Jul 28, 2021
5da6cfe
adding dev version of post_gfs.F90
SMoorthi-emc Jul 29, 2021
e011b4e
after submodule sync
SMoorthi-emc Jul 29, 2021
c04074a
changing hsmax and himax to 1.0e12
SMoorthi-emc Jul 29, 2021
467ecfb
fixin a coment in GFS_typedefs.F90
SMoorthi-emc Jul 29, 2021
924658c
after merging with fv3atm/develop on July 29, 2021
SMoorthi-emc Jul 29, 2021
283139d
fix a typo in .gitmodules
SMoorthi-emc Jul 29, 2021
4fa71a3
after merging with SM_Jul272021_cice_alb and reverting to my version …
SMoorthi-emc Jul 30, 2021
5086bbc
fixing the crash in noahmp in debug mode
SMoorthi-emc Aug 2, 2021
a10fac6
updating FV3GFS_io to add check on soiltype bein less than zero or 14…
SMoorthi-emc Aug 2, 2021
d646f9a
after merging with fv3atm/develop on Aug 05, 2021
SMoorthi-emc Aug 5, 2021
a079d6c
after merging with branch SM_Jul272021_cice_alb
SMoorthi-emc Aug 6, 2021
c6028af
removing *_v17_* SDF
SMoorthi-emc Aug 9, 2021
71ae810
some fixes done in cice_alb branch
SMoorthi-emc Aug 10, 2021
354ae59
after merging with fv3atm/develop on Aug 10, 2021
SMoorthi-emc Aug 10, 2021
56a810e
adding anew suite
SMoorthi-emc Aug 12, 2021
8778465
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Aug 12, 2021
cfd6cdc
after merging with fv3atm/develop and a minor update to FV3GFS_io.F90
SMoorthi-emc Aug 12, 2021
193432a
adding a new SDF
SMoorthi-emc Aug 13, 2021
188d794
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Aug 13, 2021
883e2e9
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Aug 17, 2021
d168b8d
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Aug 18, 2021
813c5a6
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Aug 19, 2021
c3b9f4b
fixing indentation
SMoorthi-emc Aug 19, 2021
b50c5b7
some minot cleanup
SMoorthi-emc Aug 21, 2021
1df45bb
after merging with fv3atm/develop on Aug 25, 2021
SMoorthi-emc Aug 26, 2021
521b2b7
after merging with fv3atm/develop and adding a new suite suite_FV3_GF…
SMoorthi-emc Aug 27, 2021
05b0037
fix a bug in post_gfs
SMoorthi-emc Sep 3, 2021
852dc55
after merging with fv3atm/develop and some update to post_gfs
SMoorthi-emc Sep 3, 2021
c2b7199
some additional fix I guess
SMoorthi-emc Sep 4, 2021
239fa2d
some blank changes in post_gfs
SMoorthi-emc Sep 5, 2021
d464edf
Merge remote-tracking branch 'upstream/develop' into SM_Jul272021
SMoorthi-emc Sep 7, 2021
ef4ec35
after merging with fv3atm/develop
SMoorthi-emc Sep 10, 2021
b176a23
testing assign_import before ca
SMoorthi-emc Sep 15, 2021
f466f3a
removing interstitial land and ice emissivities
SMoorthi-emc Sep 16, 2021
7e55fa9
after updating submodules
SMoorthi-emc Sep 16, 2021
a63f49c
improve treatment of emissivity and remove related unnecessary inters…
SMoorthi-emc Sep 17, 2021
f26ccec
reverting post_gfs to dev version and pointing dynamics to dev version
SMoorthi-emc Sep 21, 2021
d6d014f
fix typo in .gitmodules
SMoorthi-emc Sep 21, 2021
2159389
reverting a change in atmos_model.F90
SMoorthi-emc Sep 21, 2021
fab2270
after syncing submodules
SMoorthi-emc Sep 22, 2021
637f0dd
after merging with develop
SMoorthi-emc Sep 24, 2021
c71a0bb
after merging with develop on Sept 23
SMoorthi-emc Sep 24, 2021
5828e5b
after merging withn develop
SMoorthi-emc Sep 24, 2021
69b67de
after merging withn develop
SMoorthi-emc Sep 24, 2021
3221807
updating GFS_typedefs.F90 to to define sncove_ice outside of RUC if
SMoorthi-emc Sep 25, 2021
23257fe
updating GFS_typedefs.F90 to to define sncove_ice outside of RUC if
SMoorthi-emc Sep 25, 2021
98c56bc
remove/add some blanks
SMoorthi-emc Sep 27, 2021
db584bb
after merging with fv3atm/develop
SMoorthi-emc Sep 27, 2021
b8a81e3
after merging with fv3atm/develop
SMoorthi-emc Sep 27, 2021
438ab87
updating to use estimated emissivity from the ice model when coupled
SMoorthi-emc Sep 28, 2021
333f465
updating to include estimated emissivity from CICE
SMoorthi-emc Sep 28, 2021
26c4cb1
switching calling sfc_sice before nst in two suites
SMoorthi-emc Sep 29, 2021
16205ee
after merging with fv3atm/develog and modifying two suites
SMoorthi-emc Sep 29, 2021
0a2c6c0
making 'huge' a namelist variable
SMoorthi-emc Sep 30, 2021
a8892bc
after merging with develop
SMoorthi-emc Sep 30, 2021
376a9d9
after merge with fv3atm/develop
SMoorthi-emc Sep 30, 2021
740d225
after merge with fv3atm/develop
SMoorthi-emc Sep 30, 2021
db3687e
a temporary fix for underflow in FV3GFS_io for tiice
SMoorthi-emc Oct 1, 2021
8a3bddb
Merge remote-tracking branch 'upstream/develop' into SM_Sept21_PR
SMoorthi-emc Oct 1, 2021
86f03e4
Merge remote-tracking branch 'upstream/develop' into SM_Sep142021
SMoorthi-emc Oct 1, 2021
48ec11c
after merge with fv3atm/develop
SMoorthi-emc Oct 1, 2021
bd06688
after merging with fv3atm/develop
SMoorthi-emc Oct 4, 2021
bffb1ed
after merging with fv3atm/develop
SMoorthi-emc Oct 4, 2021
7eaae73
updated .gitmodules
SMoorthi-emc Oct 5, 2021
4ec0b67
Merge remote-tracking branch 'upstream/develop' into SM_Sept21_PR
SMoorthi-emc Oct 5, 2021
0923743
Merge remote-tracking branch 'upstream/develop' into SM_Sep142021
SMoorthi-emc Oct 5, 2021
9d5e707
after merge with fv3atm/develop
SMoorthi-emc Oct 7, 2021
e08c4e9
Add guard for unsupported combination of cplflx and cplice to GFS_typ…
climbfuji Oct 8, 2021
99eb1d2
adding ice emissivity and snow cover to restart file and adding prote…
SMoorthi-emc Oct 9, 2021
f481644
after merging with SM_Sep142021
SMoorthi-emc Oct 10, 2021
6512959
reverting post_gfs to develop version
SMoorthi-emc Oct 10, 2021
a50c5dc
fixing FV3GFS_io.F90
SMoorthi-emc Oct 11, 2021
04b926d
additional updates to emissivity calculation etc
SMoorthi-emc Oct 15, 2021
2487d45
after syncing with ccpp branch
SMoorthi-emc Oct 18, 2021
d135946
Merge pull request #4 from climbfuji/gfs_typedefs_update_moorthi_sep21
SMoorthi-emc Oct 19, 2021
fd5f5ff
after updating atmos_cuber_sphere pointer
SMoorthi-emc Oct 19, 2021
4e8d640
updating pointer to ccpp framework
SMoorthi-emc Oct 19, 2021
fc513f3
Merge remote-tracking branch 'upstream/develop' into SM_Sept21_PR
SMoorthi-emc Oct 19, 2021
1800bff
after syncing
SMoorthi-emc Oct 20, 2021
1615547
updating ccpp pointer to main
SMoorthi-emc Oct 22, 2021
4901e89
updating .gitmodules
SMoorthi-emc Oct 22, 2021
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
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
url = https://github.com/SMoorthi-emc/ccpp-physics
branch = SM_Sept21_PR
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

.gitmodules will need to be reverted

24 changes: 17 additions & 7 deletions atmos_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,9 @@ subroutine atmos_timestep_diagnostics(Atmos)
if(.not. GFS_control%first_time_step) then
pmaxloc = 0.0d0
recvbuf = 0.0d0
psum = 0.0d0
pcount = 0.0d0
maxabs = 0.0d0
psum = 0.0d0
pcount = 0.0d0
maxabs = 0.0d0

! Put pgr stats in pmaxloc, psum, and pcount:
pmaxloc(1) = GFS_Control%tile_num
Expand All @@ -434,11 +434,11 @@ subroutine atmos_timestep_diagnostics(Atmos)
do i=1,count
pdiff = GFS_data(nb)%Statein%pgr(i)-GFS_data(nb)%Intdiag%old_pgr(i)
adiff = abs(pdiff)
psum = psum+adiff
psum = psum + adiff
if(adiff>=maxabs) then
maxabs=adiff
pmaxloc(2:3)=(/ ATM_block%index(nb)%ii(i), ATM_block%index(nb)%jj(i) /)
pmaxloc(4:7)=(/ pdiff, GFS_data(nb)%Statein%pgr(i), &
pmaxloc(2:3) = (/ ATM_block%index(nb)%ii(i), ATM_block%index(nb)%jj(i) /)
pmaxloc(4:7) = (/ pdiff, GFS_data(nb)%Statein%pgr(i), &
GFS_data(nb)%Grid%xlat(i), GFS_data(nb)%Grid%xlon(i) /)
endif
enddo
Expand Down Expand Up @@ -1642,6 +1642,7 @@ subroutine assign_importdata(jdat, rc)
! real(kind=GFS_kind_phys), parameter :: hsmax = 100.0 !< maximum snow depth (m) allowed
real(kind=GFS_kind_phys), parameter :: himax = 1.0e12 !< maximum ice thickness allowed
real(kind=GFS_kind_phys), parameter :: hsmax = 1.0e12 !< maximum snow depth (m) allowed
real(kind=GFS_kind_phys), parameter :: con_sbc = 5.670400e-8_GFS_kind_phys !< stefan-boltzmann
!
!------------------------------------------------------------------------------
!
Expand Down Expand Up @@ -2479,7 +2480,7 @@ subroutine assign_importdata(jdat, rc)

! update sea ice related fields:
if( lcpl_fice ) then
!$omp parallel do default(shared) private(i,j,nb,ix)
!$omp parallel do default(shared) private(i,j,nb,ix,tem)
do j=jsc,jec
do i=isc,iec
nb = Atm_block%blkno(i,j)
Expand All @@ -2490,6 +2491,15 @@ subroutine assign_importdata(jdat, rc)
GFS_data(nb)%Coupling%hsnoin_cpl(ix) = min(hsmax, GFS_data(nb)%Coupling%hsnoin_cpl(ix) &
/ (GFS_data(nb)%Sfcprop%fice(ix)*GFS_data(nb)%Sfcprop%oceanfrac(ix)))
GFS_data(nb)%Sfcprop%zorli(ix) = z0ice
tem = GFS_data(nb)%Sfcprop%tisfc(ix) * GFS_data(nb)%Sfcprop%tisfc(ix)
tem = con_sbc * tem * tem
Comment on lines +2494 to +2495
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a suggestion, this can (safely) be written as tem = con_sbc * GFS_data(nb)%Sfcprop%tisfc(ix)**4. Gone are the days when this was necessary. Compilers know how to optimize these kind of expressions.

if (GFS_data(nb)%Coupling%ulwsfcin_cpl(ix) > zero) then
GFS_data(nb)%Sfcprop%emis_ice(ix) = GFS_data(nb)%Coupling%ulwsfcin_cpl(ix) / tem
GFS_data(nb)%Sfcprop%emis_ice(ix) = max(0.9, min(one, GFS_data(nb)%Sfcprop%emis_ice(ix)))
else
GFS_data(nb)%Sfcprop%emis_ice(ix) = 0.96
endif
GFS_data(nb)%Coupling%ulwsfcin_cpl(ix) = tem * GFS_data(nb)%Sfcprop%emis_ice(ix)
junwang-noaa marked this conversation as resolved.
Show resolved Hide resolved
else
GFS_data(nb)%Sfcprop%tisfc(ix) = GFS_data(nb)%Sfcprop%tsfco(ix)
GFS_data(nb)%Sfcprop%fice(ix) = zero
Expand Down
208 changes: 103 additions & 105 deletions ccpp/data/GFS_typedefs.F90

Large diffs are not rendered by default.

75 changes: 27 additions & 48 deletions ccpp/data/GFS_typedefs.meta
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,8 @@
type = real
kind = kind_phys
[tisfc]
standard_name = sea_ice_temperature
long_name = sea ice surface skin temperature
standard_name = surface_skin_temperature_over_ice
Copy link
Collaborator

@DeniseWorthen DeniseWorthen Oct 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this now refer to all ice (lake & sea-ice)?

long_name = surface skin temperature over ice
units = K
dimensions = (horizontal_loop_extent)
type = real
Expand Down Expand Up @@ -592,6 +592,20 @@
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[snodi]
standard_name = surface_snow_thickness_water_equivalent_over_ice
long_name = water equivalent snow depth over ice
units = mm
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[weasdi]
standard_name = water_equivalent_accumulated_snow_depth_over_ice
long_name = water equiv of acc snow depth over land
units = mm
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[hprime]
standard_name = statistical_measures_of_subgrid_orography_collection_array
long_name = orographic metrics
Expand Down Expand Up @@ -1346,31 +1360,31 @@
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo .eqv. .true.)
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo)
[albdifvis_ice]
standard_name = surface_albedo_diffuse_visible_over_ice
long_name = diffuse surface albedo visible band over ice
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo .eqv. .true.)
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo)
[albdirnir_ice]
standard_name = surface_albedo_direct_NIR_over_ice
long_name = direct surface albedo NIR band over ice
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo .eqv. .true.)
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo)
[albdifnir_ice]
standard_name = surface_albedo_diffuse_NIR_over_ice
long_name = diffuse surface albedo NIR band over ice
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo .eqv. .true.)
active = (control_for_land_surface_scheme == identifier_for_ruc_land_surface_scheme .or. flag_for_cice_albedo)
[wetness]
standard_name = normalized_soil_wetness_for_land_surface_model
long_name = normalized soil wetness for lsm
Expand Down Expand Up @@ -5203,6 +5217,13 @@
dimensions = ()
type = real
kind = kind_phys
[huge]
standard_name = netcdf_float_fillvalue
long_name = definition of NetCDF float FillValue
units = none
dimensions = ()
type = real
kind = kind_phys
[icloud]
standard_name = control_for_cloud_area_fraction_option
long_name = cloud effect to the optical depth and cloud fraction in radiation
Expand Down Expand Up @@ -8215,20 +8236,6 @@
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[semis_land]
standard_name = surface_longwave_emissivity_over_land_interstitial
long_name = surface lw emissivity in fraction over land (temporary use as interstitial)
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[semis_ice]
standard_name = surface_longwave_emissivity_over_ice_interstitial
long_name = surface lw emissivity in fraction over ice (temporary use as interstitial)
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[ep1d]
standard_name = surface_upward_potential_latent_heat_flux
long_name = surface upward potential latent heat flux
Expand Down Expand Up @@ -9537,13 +9544,6 @@
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[snowd_ice]
standard_name = surface_snow_thickness_water_equivalent_over_ice
long_name = water equivalent snow depth over ice
units = mm
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[snowd_land_save]
standard_name = surface_snow_thickness_water_equivalent_over_land_save
long_name = water equivalent snow depth over land before entering a physics scheme
Expand Down Expand Up @@ -9770,13 +9770,6 @@
type = real
kind = kind_phys
active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
[tsfc_ice]
standard_name = surface_skin_temperature_over_ice
long_name = surface skin temperature over ice
units = K
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[tsfg]
standard_name = surface_ground_temperature_for_radiation
long_name = surface ground temperature for radiation
Expand Down Expand Up @@ -9883,13 +9876,6 @@
type = real
kind = kind_phys
active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
[weasd_ice]
standard_name = water_equivalent_accumulated_snow_depth_over_ice
long_name = water equiv of acc snow depth over ice
units = mm
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
[wind]
standard_name = wind_speed_at_lowest_model_layer
long_name = wind speed at lowest model level
Expand Down Expand Up @@ -10666,13 +10652,6 @@
units = none
dimensions = ()
type = integer
[huge]
standard_name = netcdf_float_fillvalue
long_name = definition of NetCDF float FillValue
units = none
dimensions = ()
type = real
kind = kind_phys
[con_cliq]
standard_name = specific_heat_of_liquid_water_at_constant_pressure
long_name = specific heat of liquid water at constant pressure
Expand Down
95 changes: 95 additions & 0 deletions ccpp/suites/suite_FV3_GFSv17alp_cpldnsstrasnoahmp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFSv17alp_cpldnsstrasnoahmp" version="1">
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we remove this one if the next suite file FV3_GFSv17alp_cpldnsstrasugwpnoahmp is working?

<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>fv_sat_adj</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>noahmpdrv</scheme>
<scheme>sfc_cice</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>satmedmfvdifq</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>rascnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>samfshalcnv</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>phys_tend</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
Loading