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

Jump to bottom

Update AQM RT's to v16 and update input-data (Merged with Bring AQM changes from production/AQM.v7 into develop branch #2279) #2287

Open
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

Update AQM RT's to v16 and update input-data (Merged with Bring AQM changes from production/AQM.v7 into develop branch #2279) #2287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
100d140
Bring in AQM changes and .gitmodules changes
BrianCurtis-NOAA May 13, 2024
486c056
Testing changes, bringing regional_atmaq with debug test back
BrianCurtis-NOAA May 13, 2024
f0e2f96
upgrade aqm from gfs_v15p2 to gfs_v16
BrianCurtis-NOAA May 13, 2024
d4bb452
resolve merge conflicts
BrianCurtis-NOAA May 13, 2024
a7dd105
bring in the aqm.rc maintained in testing structure instead of in inp…
BrianCurtis-NOAA May 14, 2024
23b1c4f
Merge branch 'enable_aqm' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA May 14, 2024
ce2d40f
Merge branch 'ufs-community:develop' into enable_aqm
BrianCurtis-NOAA May 17, 2024
900eb84
Testing changes to reduce resources by some from production settings
BrianCurtis-NOAA May 20, 2024
41968a3
Merge branch 'develop' of github.com:ufs-community/ufs-weather-model …
BrianCurtis-NOAA May 20, 2024
f628fd2
Update fv3_conf for AQM to point to inputdata dir along with test adj…
BrianCurtis-NOAA May 21, 2024
c1d3a8c
Merge branch 'enable_aqm' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA May 21, 2024
78dee5b
hera proof only atmaq tests failing, plus test_changes.list update
BrianCurtis-NOAA May 21, 2024
ced5e01
Merge branch 'develop' into prod2dev
BrianCurtis-NOAA Jun 3, 2024
c02cc26
Merge branch 'ufs-community:develop' into prod2dev
BrianCurtis-NOAA Jun 11, 2024
dda08f2
Merge conflict resolution
BrianCurtis-NOAA Jun 11, 2024
bff07b5
Bring in prod2dev and fix any merging issues
BrianCurtis-NOAA Jun 11, 2024
0d077ca
Hera Log showing only 2 tests fail
BrianCurtis-NOAA Jun 12, 2024
fe9a8a9
Update bl_date.conf
BrianCurtis-NOAA Jun 12, 2024
b37b605
Adding extra WLCLK for now for atmaq tests
BrianCurtis-NOAA Jun 12, 2024
7574690
Merge branch 'enable_aqm' of github.com:BrianCurtis-NOAA/ufs-weather-…
BrianCurtis-NOAA Jun 12, 2024
c1bbd96
WCOSS2 RT Log: Passed
BrianCurtis-NOAA Jun 13, 2024
3e0e87e
add hera RT log passed
FernandoAndrade-NOAA Jun 13, 2024
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,10 @@
branch = develop
[submodule "AQM"]
path = AQM
url = https://github.com/NOAA-EMC/AQM
branch = develop
#url = https://github.com/NOAA-EMC/AQM
#branch = develop
url = https://github.com/BrianCurtis-NOAA/AQM
branch = prod2dev
[submodule "NOAHMP"]
path = NOAHMP-interface/noahmp
url = https://github.com/NOAA-EMC/noahmp
Expand Down
2 changes: 1 addition & 1 deletion AQM
Open in desktop
Submodule AQM updated 8 files
+2 −1 CMakeLists.txt
+4 −12 aqm_files.cmake
+2 −2 src/io/ioapi/m3utilio.F90
+2,501 −0 src/model/src/CSQY_DATA.F
+894 −0 src/model/src/aero_depv.F
+16,740 −0 src/model/src/isocom.f
+49 −0 src/model/src/noop_modules.f
+5 −2 src/shr/aqm_emis_mod.F90
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240607
export BL_DATE=20240612
4 changes: 2 additions & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
export OCN_tasks_cdeps_025=120
export ICE_tasks_cdeps_025=48

export INPES_aqm=33
export JNPES_aqm=8
export INPES_aqm=25
export JNPES_aqm=34

export THRD_cpl_unstr=1
export INPES_cpl_unstr=3
Expand Down
37 changes: 4 additions & 33 deletions tests/fv3_conf/fv3_aqm.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,6 @@
rm -rf INPUT RESTART
mkdir INPUT RESTART
mkdir RESTART

cp -r @[INPUTDATA_ROOT]/AQM/INPUT/* ./INPUT/
cp -r @[INPUTDATA_ROOT]/AQM/NEXUS .

cp @[INPUTDATA_ROOT]/AQM/fix/C775.facsf.tile7.halo0.nc C775.facsf.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.facsf.tile7.halo4.nc C775.facsf.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.maximum_snow_albedo.tile7.halo0.nc C775.maximum_snow_albedo.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.maximum_snow_albedo.tile7.halo4.nc C775.maximum_snow_albedo.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.slope_type.tile7.halo0.nc C775.slope_type.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.slope_type.tile7.halo4.nc C775.slope_type.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.snowfree_albedo.tile7.halo0.nc C775.snowfree_albedo.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.snowfree_albedo.tile7.halo4.nc C775.snowfree_albedo.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.soil_type.tile7.halo0.nc C775.soil_type.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.soil_type.tile7.halo4.nc C775.soil_type.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.substrate_temperature.tile7.halo0.nc C775.substrate_temperature.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.substrate_temperature.tile7.halo4.nc C775.substrate_temperature.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_greenness.tile7.halo0.nc C775.vegetation_greenness.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_greenness.tile7.halo4.nc C775.vegetation_greenness.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_type.tile7.halo0.nc C775.vegetation_type.tile1.nc
cp @[INPUTDATA_ROOT]/AQM/fix/C775.vegetation_type.tile7.halo4.nc C775.vegetation_type.tile7.nc
cp @[INPUTDATA_ROOT]/AQM/fix/AE_cb6r3_ae6_aq.nml .
cp @[INPUTDATA_ROOT]/AQM/fix/BEIS_RRFScmaq_C775.ncf .
cp @[INPUTDATA_ROOT]/AQM/fix/CSQY_DATA_cb6r3_ae6_aq .
cp @[INPUTDATA_ROOT]/AQM/fix/GC_cb6r3_ae6_aq.nml .
cp @[INPUTDATA_ROOT]/AQM/fix/global_soilmgldas.t126.384.190.grb .
cp @[INPUTDATA_ROOT]/AQM/fix/gspro_biogenics_1mar2017.txt .
cp @[INPUTDATA_ROOT]/AQM/fix/Hourly_Emissions_regrid_rrfs_13km_20190801_t12z_h72.nc .
cp @[INPUTDATA_ROOT]/AQM/fix/NR_cb6r3_ae6_aq.nml .
cp @[INPUTDATA_ROOT]/AQM/fix/omi_cmaq_2015_361X179.dat .
cp @[INPUTDATA_ROOT]/AQM/fix/PHOT_OPTICS.dat .
cp @[INPUTDATA_ROOT]/AQM/fix/Species_Table_TR_0.nml .
cp @[INPUTDATA_ROOT]/AQM/fix/pt-2019080112.nc .
cp @[INPUTDATA_ROOT]/AQM/fix/FENGSHA_p8_10km_inputs_CONUS_775.nc .
cp -r @[INPUTDATA_ROOT]/AQMv7/INPUT .
cp -r @[INPUTDATA_ROOT]/AQMv7/fix/* .
cp ${PATHRT}/parm/aqm/aqm.rc .
746 changes: 375 additions & 371 deletions tests/logs/RegressionTests_hera.log
View file
Open in desktop

Large diffs are not rendered by default.

471 changes: 237 additions & 234 deletions tests/logs/RegressionTests_wcoss2.log
View file
Open in desktop

Large diffs are not rendered by default.

Loading
Loading