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.

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

Enable Thompson microphysics with UFS-Aerosols and update GOCART #1049

Merged
merged 23 commits into from
Feb 22, 2022
Merged

Enable Thompson microphysics with UFS-Aerosols and update GOCART #1049

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9d21670
Update GOCART submodule.
rmontuoro Feb 5, 2022
3704946
Update GOCART submodule.
rmontuoro Feb 11, 2022
1085349
Merge branch 'develop' into feature/gocart-update
rmontuoro Feb 11, 2022
fe8647c
Update FV3 submodule to point to forked repository.
rmontuoro Feb 11, 2022
e48134a
Update FV3 submodule.
rmontuoro Feb 11, 2022
40bef60
Update GOCART submodule.
rmontuoro Feb 11, 2022
7b3c78f
Update GOCART configuration files for regression test 'control_atm_ae…
rmontuoro Feb 14, 2022
019af77
Add regression test log on Hera/Intel.
rmontuoro Feb 14, 2022
03bedbc
Add regression test log on Orion/Intel.
rmontuoro Feb 14, 2022
884ac59
Update FV3 submodule.
rmontuoro Feb 16, 2022
df0a3f4
Merge branch 'develop' into feature/gocart-update
rmontuoro Feb 16, 2022
a5798ac
Update FV3 submodule.
rmontuoro Feb 18, 2022
117c0c6
Merge branch 'develop' into feature/gocart-update
rmontuoro Feb 18, 2022
02d62f7
[AutoRT] cheyenne.gnu Job Completed.
BrianCurtis-NOAA Feb 18, 2022
91d116f
[AutoRT] cheyenne.intel Job Completed.
BrianCurtis-NOAA Feb 18, 2022
c5e6fd2
[AutoRT] orion.intel Job Completed.
BrianCurtis-NOAA Feb 18, 2022
70fd6f6
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Feb 18, 2022
7f9db92
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Feb 18, 2022
89d0ab7
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Feb 18, 2022
cb27901
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Feb 18, 2022
e09a1e7
Add regression test log for WCOSS Cray.
rmontuoro Feb 19, 2022
939004e
add dell log file
junwang-noaa Feb 22, 2022
945c1f0
update FV3 to noaa-emc develop branch
junwang-noaa Feb 22, 2022
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
8 changes: 4 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down Expand Up @@ -38,3 +34,7 @@
path = GOCART
url = https://github.com/GEOS-ESM/GOCART
branch = develop
[submodule "FV3"]
path = FV3
url = https://github.com/rmontuoro/fv3atm
branch = develop
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 1 files
+8 −4 ccpp/data/GFS_typedefs.F90
2 changes: 1 addition & 1 deletion GOCART
Open in desktop
Submodule GOCART updated 540 files
248 changes: 124 additions & 124 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

762 changes: 381 additions & 381 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

738 changes: 369 additions & 369 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

244 changes: 122 additions & 122 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

772 changes: 386 additions & 386 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

712 changes: 356 additions & 356 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

754 changes: 377 additions & 377 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

496 changes: 248 additions & 248 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

803 changes: 396 additions & 407 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions tests/parm/gocart/AERO_ExtData.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ OC_ANTEOC2 NA Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 ExtData/PIESA/sfc/HTAP
# EDGAR based ship emissions
OC_SHIP NA Y Y %y4-%m2-%d2t12:00:00 none none oc_ship ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_oc.ships.x3600_y1800_t12.2010.nc4

# Aircraft fuel consumption
OC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null

# Aviation emissions during the three phases of flight
OC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_oc.aviation_lto.x3600_y1800_t12.2010.nc4
OC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_oc.aviation_cds.x3600_y1800_t12.2010.nc4
Expand All @@ -119,6 +122,9 @@ BC_ANTEBC2 NA Y Y %y4-%m2-%d2t12:00:00 none none antebc2 ExtData/PIESA/sfc/HTAP
# EDGAR based ship emissions
BC_SHIP NA Y Y %y4-%m2-%d2t12:00:00 none none bc_ship ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_bc.ships.x3600_y1800_t12.2010.nc4

# Aircraft fuel consumption
BC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null

# Aviation emissions during the LTO, SDC and CRS phases of flight
BC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_bc.aviation_lto.x3600_y1800_t12.2010.nc4
BC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/PIESA/sfc/HTAP/v2.2/htap-v2.2.emis_bc.aviation_cds.x3600_y1800_t12.2010.nc4
Expand All @@ -143,6 +149,9 @@ BRC_ANTEBRC2 NA Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null
# EDGAR based ship emissions
BRC_SHIP NA Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null

# Aircraft fuel consumption
BRC_AIRCRAFT NA N Y %y4-%m2-%d2t12:00:00 none none none /dev/null

# Aviation emissions during the three phases of flight
BRC_AVIATION_LTO NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
BRC_AVIATION_CDS NA Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
Expand Down
4 changes: 4 additions & 0 deletions tests/parm/gocart/CA2G_instance_CA.bc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ nbins: 2
aerosol_radBands_optics_file: ExtData/optics/opticsBands_BC.v1_3.RRTMG.nc
aerosol_monochromatic_optics_file: ExtData/monochromatic/optics_BC.v1_3.nc

# Aircraft emission factor: convert input unit to kg C
aircraft_fuel_emission_factor: 1.0000

# Heights [m] of LTO, CDS and CRS aviation emissions layers
aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3

Expand Down Expand Up @@ -35,3 +38,4 @@ sigma: 2.0 2.0

pressure_lid_in_hPa: 0.01

point_emissions_srcfilen: /dev/null
5 changes: 5 additions & 0 deletions tests/parm/gocart/CA2G_instance_CA.oc.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
aerosol_radBands_optics_file: ExtData/optics/opticsBands_OC.v1_3.RRTMG.nc
aerosol_monochromatic_optics_file: ExtData/monochromatic/optics_OC.v1_3.nc

# Aircraft emission factor: convert input unit to kg C
aircraft_fuel_emission_factor: 1.0000

# Heights [m] of LTO, CDS and CRS aviation emissions layers
aviation_vertical_layers: 0.0 100.0 9.0e3 10.0e3

Expand Down Expand Up @@ -41,3 +44,5 @@ sigma: 2.20 2.20
pressure_lid_in_hPa: 0.01

nbins: 2

point_emissions_srcfilen: /dev/null