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

Various updates for MMF needed for integrating into E3SM #130

Merged
merged 134 commits into from
Sep 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
7335c25
bug fix in sponge layer
whannah1 Jan 26, 2023
1c56ca8
delete unused line
whannah1 Jan 26, 2023
32bc3b7
Merge branch 'master' of github.com:E3SM-Project/PAM into whannah/pam…
whannah1 Feb 7, 2023
58a7b90
makei SHOC error message more useful
whannah1 Feb 14, 2023
cc26e47
Merge branch 'whannah/pam/MMF-fixes' of github.com:E3SM-Project/PAM i…
whannah1 Feb 14, 2023
ca95c37
add support for directly forcing cloud liq/ice
whannah1 Feb 16, 2023
ea7a784
Merge branch 'master' of github.com:E3SM-Project/PAM into HEAD
xyuan Mar 2, 2023
1c6ce3e
add minor fix for integrated build in E3SM
xyuan Mar 2, 2023
dace53a
manually revert changes to GCM forcing routines
whannah1 Mar 7, 2023
0cdbd73
fix white space
whannah1 Mar 7, 2023
979bc07
reapply GCM forcing changes for water species
whannah1 Mar 7, 2023
b6a1add
disable liquid and ice water forcing
whannah1 Mar 7, 2023
fac2ea6
update min/max to use std::
whannah1 Mar 7, 2023
2bf423e
remove const that was casuing build error
whannah1 Mar 7, 2023
2829b83
Merge remote-tracking branch 'origin/master' into whannah/pam/MMF-fixes
whannah1 Mar 8, 2023
99dc000
disable dry density forcing unless using PAM-A
whannah1 Mar 8, 2023
2ae10f8
Do not compute dHsdx inside halo region
mwarusz Apr 7, 2023
f3ba759
Merge remote-tracking branch 'origin/master' into whannah/pam/MMF-fixes
whannah1 Apr 7, 2023
122b6ad
enable mods for forcing all water species separately
whannah1 Apr 7, 2023
1e0362e
disable debugging stuff for PAM-C
whannah1 Apr 7, 2023
cfe5f35
adjust precip units
whannah1 Apr 7, 2023
ccc227c
add define MMF_PAM_FORCE_ALL_WATER_SPECIES
whannah1 Apr 7, 2023
a81ac92
reorder vertical dimension for P3
whannah1 Apr 11, 2023
2a1ae72
revert precip unit change
whannah1 Apr 11, 2023
ef6dc37
disable CPP define for water condensate forcing
whannah1 Apr 13, 2023
74cadad
update SHOC interface for PAM
whannah1 Apr 13, 2023
017dd5f
rename relvar to inv_qc_relvar to be consistent with SCREAM
whannah1 Apr 13, 2023
485a8cf
update P3 interface - switch to dry pressure
whannah1 Apr 14, 2023
d09a3c1
clean up GCM forcing
whannah1 Apr 14, 2023
b59a390
minor change for the sake fo clarity
whannah1 Apr 14, 2023
44885c2
update SHOC interface for SCREAM code
whannah1 Apr 19, 2023
24a1b9a
add ifdef for p3_tend_out
whannah1 Apr 19, 2023
0dad247
update gcm_forcing
whannah1 Apr 27, 2023
ee01945
add reference state variables to coupler
whannah1 Apr 27, 2023
4ef87b2
remove spam++ from cmake
whannah1 Apr 27, 2023
d32d507
update handling of anelastic reference state
whannah1 Apr 27, 2023
0fd3e34
misc SHOC interface changes - still not finalized
whannah1 Apr 28, 2023
e919bf7
Merge remote-tracking branch 'origin/mw/fix' into whannah/pam/MMF-fixes
whannah1 May 1, 2023
37038f0
Merge branch 'whannah/pam/MMF-fixes' of github.com:E3SM-Project/PAM i…
whannah1 May 1, 2023
0797ef5
add initialization of reference state coupler vairables
whannah1 May 1, 2023
0620310
bug fix and clean up of SHOC interface
whannah1 May 1, 2023
7172d45
update pressure treatment in P3
whannah1 May 2, 2023
72c1129
Update coefficients of pressure solver after updating reference state
mwarusz May 5, 2023
474cd0b
Merge pull request #113 from E3SM-Project/mw/pam/MMF-fixes
whannah1 May 5, 2023
cc9bd6f
Merge branch 'whannah/pam/MMF-fixes' of github.com:E3SM-Project/PAM i…
whannah1 May 5, 2023
1429a57
add update_pressure_solver
whannah1 May 8, 2023
06c7b64
Try disabling subtraction and addition of reference state
mwarusz May 10, 2023
3b5ab3f
add temporary debugging print statements (will remove later)
whannah1 May 10, 2023
8f66463
Merge remote-tracking branch 'origin/mw/fix' into whannah/pam/MMF-fixes
whannah1 May 10, 2023
1d1fa09
fix ref state variables in extrudedmodel.h
whannah1 May 11, 2023
156e195
update microphysics interface
whannah1 May 11, 2023
f01c796
update SGS.h
whannah1 May 11, 2023
b89e606
update Dycor.h
whannah1 May 11, 2023
7076b82
add output for P3 phase change tendencies
whannah1 May 12, 2023
b520ee7
fix AN/MAN dycore <-> coupler state conversion
celdredsandia May 12, 2023
2e7fe65
add MMF_PAM_DISABLE_DYCOR_RUN
whannah1 May 12, 2023
80df408
Merge anelastic dycor changes from Chris E.
whannah1 May 12, 2023
dfe6a9d
add verbose control to limit log file size in MMF
whannah1 May 19, 2023
2fa15b1
modify how lookup tables are loaded for each P3 call
whannah1 May 19, 2023
0ed8a62
remove MMF_PAM_DISABLE_DYCOR_RUN
whannah1 May 30, 2023
3523e05
adjust friction units - still not stable
whannah1 May 30, 2023
f678d69
cosmetic fix
whannah1 May 30, 2023
4df3594
P3 adjustments
whannah1 May 30, 2023
5ac01f6
initialize surface momentum fluxes
whannah1 May 31, 2023
e2f2410
only set SCREAM_DATA_DIR for standalone
whannah1 Jun 1, 2023
f80fcc3
fix SCREAM paths in cmake
whannah1 Jun 1, 2023
894381c
bug fix and cosmetic updates for surface_friction
whannah1 Jun 2, 2023
b71fd43
modify verbose option in dycor
whannah1 Jun 5, 2023
945c95d
modify how to specify couple_wind_exact_inverse
whannah1 Jun 5, 2023
33d91b5
fix total water forcing option
whannah1 Jun 5, 2023
ef5e842
Merge remote-tracking branch 'origin/master' into whannah/pam/MMF-fixes
whannah1 Jun 7, 2023
1b88986
fix total water forcing
whannah1 Jun 9, 2023
7902d7f
expose crm_per_phys
whannah1 Jun 9, 2023
8899a61
Merge remote-tracking branch 'origin/master' into whannah/pam/MMF-fixes
whannah1 Jun 9, 2023
1e2cff9
change crm_per_phys to crm_dyn_per_phys
whannah1 Jun 13, 2023
363ab96
misc debugging updates
whannah1 Jun 13, 2023
8bb6ac8
progress towards making mmf_simplified work like E3SM-MMF
celdredsandia Jun 14, 2023
e7ebf91
mmf_simplified pure dycore now working
celdredsandia Jun 14, 2023
b3e5446
Progress towards making PAM-C and coupler output their whole state
celdredsandia Jun 15, 2023
6fc7ef8
rename pamc_xvel to xvel_stag
celdredsandia Jun 15, 2023
ce2fcee
fix typo
celdredsandia Jun 15, 2023
504d940
revert debugging print statements in dycor.h
whannah1 Jun 23, 2023
b090c2c
revert debugging statements in variablesets
whannah1 Jun 23, 2023
268c213
add kfix to extrudedmodel.h
whannah1 Jun 23, 2023
365678f
Merge branch 'whannah/pam/MMF-fixes' of github.com:E3SM-Project/PAM i…
whannah1 Jun 23, 2023
cf16f49
split coupling into densities and wind, and add more coupler output i…
celdredsandia Jun 23, 2023
cfeb1f2
coupler output
celdredsandia Jun 23, 2023
d587345
use std complex library to avoid build issue on Summit
whannah1 Jun 29, 2023
cf3328c
Merge branch 'whannah/pam/MMF-fixes' of github.com:E3SM-Project/PAM i…
whannah1 Jun 29, 2023
df43078
fix merge conflicts
celdredsandia Jun 29, 2023
e4a2632
Mostly updated P3 and SHOC interfaces
celdredsandia Jun 30, 2023
639b226
fix indexing bug
celdredsandia Jun 30, 2023
0de6804
cosmetic update to Dycor.h
whannah1 Jul 17, 2023
49a1f9b
update temperature perturbation - add energy conseervation scaling
whannah1 Jul 17, 2023
43aa12c
misc P3 interface updates
whannah1 Jul 17, 2023
298e2ef
misc updates to SHOC interface
whannah1 Jul 17, 2023
aa81723
add coupler variables
whannah1 Jul 17, 2023
c9450ed
update to extrudedmodel.h
whannah1 Jul 17, 2023
f8c4b83
variableset updates
whannah1 Jul 17, 2023
a83bc23
change liquid_found to liq_found
whannah1 Jul 17, 2023
d44e742
minor changes to P3 interface
whannah1 Jul 17, 2023
5fe7e46
add default values for wind coupling
whannah1 Jul 17, 2023
1e5219c
comment out alternative GCM forcing option
whannah1 Jul 18, 2023
6e198c8
update gcm_forcing
whannah1 Jul 24, 2023
42a648e
Turning off scream cxx physics for now
mrnorman Jul 26, 2023
05f430e
Dycore seems to be working
mrnorman Jul 27, 2023
bc2942c
Changing a few parameters
mrnorman Jul 27, 2023
5f2bafb
misc updates for P3/SHOC interfaces
whannah1 Jul 27, 2023
0a6d304
Separating hydrostasis update into separate routine
mrnorman Jul 27, 2023
e398cc3
Improving the hydrostasis treatment for the new dycore implementation
mrnorman Jul 28, 2023
f98607d
add dummy argument for AWFL init
whannah1 Jul 28, 2023
23f0d45
Adding the variable gravity approach to hydrostasis
mrnorman Jul 31, 2023
0f3f54a
Merge remote-tracking branch 'origin/master' into whannah/pam/MMF-fixes
whannah1 Jul 31, 2023
29c2b14
Merge remote-tracking branch 'origin/mrnorman/update-pama-dycore' int…
whannah1 Jul 31, 2023
caf50d1
misc fixes
whannah1 Jul 31, 2023
3257842
Adding GCM forcing option to hydrostasis for PAM-A
mrnorman Aug 1, 2023
6d4ad14
Merge remote-tracking branch 'origin/mrnorman/update-pama-dycore' int…
whannah1 Aug 1, 2023
fdd9b15
Removing hydrostasis from the coupler
mrnorman Aug 1, 2023
d9c14da
Merge remote-tracking branch 'origin/mrnorman/update-pama-dycore' int…
whannah1 Aug 1, 2023
977b2cf
revert changes in kessler micro
whannah1 Aug 1, 2023
50a8af7
revert change
whannah1 Aug 1, 2023
c7dad60
Fixing a mass leak in the tracers.
mrnorman Aug 2, 2023
48bdd08
Cmake updates
whannah1 Aug 3, 2023
ef440d3
Merge branch 'whannah/pam/MMF-fixes' of github.com:E3SM-Project/PAM i…
whannah1 Aug 3, 2023
6fd185f
undo cmake changes
whannah1 Aug 3, 2023
c283323
Got a banded matrix solver working
mrnorman Aug 3, 2023
24ff0e4
Merge remote-tracking branch 'origin/mrnorman/update-pama-dycore' int…
whannah1 Aug 8, 2023
aa17fe5
misc fixes for YAML build issues
whannah1 Aug 17, 2023
dc2b896
generalize setting of SCREAM_INPUT_ROOT for all machines
whannah1 Aug 17, 2023
da0fa4e
bug fix
whannah1 Aug 28, 2023
6707120
remove real-size flag for intel compiler
whannah1 Aug 31, 2023
30b3d34
adjust handling of "q_prev" for P3
whannah1 Sep 20, 2023
78b14e8
changes to support forcing number concentrations
whannah1 Sep 20, 2023
9455b41
Merge remote-tracking branch 'origin/master' into whannah/pam/MMF-fixes
whannah1 Sep 20, 2023
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "externals/YAKL"]
path = externals/YAKL
url = [email protected]:mrnorman/YAKL.git
[submodule "externals/eigen"]
path = externals/eigen
url = https://gitlab.com/libeigen/eigen.git
[submodule "externals/yaml-cpp"]
path = externals/yaml-cpp
url = [email protected]:jbeder/yaml-cpp.git
7 changes: 4 additions & 3 deletions dynamics/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ add_library(dynamics INTERFACE)
#Choose dycore
if ("${PAM_DYCORE}" STREQUAL "awfl")
add_subdirectory(awfl ./dycore)
elseif ("${PAM_DYCORE}" STREQUAL "spam++")
target_compile_definitions(dynamics INTERFACE PAM_DYCORE_AWFL)
elseif ("${PAM_DYCORE}" STREQUAL "spam")
add_subdirectory(spam ./dycore)
else ()
if ("${PAM_DYCORE}" STREQUAL "")
message(FATAL_ERROR "ERROR: You must specify -DPAM_DYCORE=[awfl,spam++] in your CMake configure line.")
message(FATAL_ERROR "ERROR: You must specify -DPAM_DYCORE=[awfl,spam] in your CMake configure line.")
else ()
message(FATAL_ERROR "ERROR: \"${PAM_DYCORE}\" is an invalid PAM_DYCORE CMake option. Valid options include \"awfl\",\"spam++\".")
message(FATAL_ERROR "ERROR: \"${PAM_DYCORE}\" is an invalid PAM_DYCORE CMake option. Valid options include \"awfl\",\"spam\".")
endif()
endif()

Expand Down
1,553 changes: 1,547 additions & 6 deletions dynamics/awfl/Dycore.h

Large diffs are not rendered by default.

Loading
Loading