Skip to content

Commit

Permalink
Merge pull request #449 from GEOS-ESM/feature/sdrabenh/hwt03_changes_…
Browse files Browse the repository at this point in the history 
…into_v11.0.0

Merge hwt_v03 changes into v11.0.0-rc1
  • Loading branch information
@sdrabenh
sdrabenh authored May 4, 2023
2 parents f81ff39 + da02ee8 commit 78ea84f
Show file tree
Hide file tree
Showing 7 changed files with 97 additions and 84 deletions.
39 changes: 26 additions & 13 deletions AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@

# Atmospheric Model Configuration Parameters
# ------------------------------------------
NX: @NX
NY: @NY
NX: @NX
NY: @NY

IOSERVER_NODES: @NUM_OSERVER_NODES
IOSERVER_NODES: @NUM_OSERVER_NODES
NUM_BACKEND_PES: @NUM_BACKEND_PES

AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
AGCM_IM: @AGCM_IM
AGCM_JM: @AGCM_JM
AGCM_LM: @AGCM_LM
AGCM_GRIDNAME: @AGCM_GRIDNAME

AGCM.GRID_TYPE: @GRID_TYPE
AGCM.GRIDNAME: @AGCM_GRIDNAME
@CUBE_AGCM AGCM.NF: @AGCM_NF
AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM
AGCM.GRID_TYPE: @GRID_TYPE
AGCM.GRIDNAME: @AGCM_GRIDNAME
@CUBE_AGCM AGCM.NF: @AGCM_NF
AGCM.LM: @AGCM_LM
AGCM.IM_WORLD: @AGCM_IM
@LATLON_AGCM AGCM.JM_WORLD: @AGCM_JM

###########################################################
# dynamics options
Expand Down Expand Up @@ -50,7 +50,7 @@ ORBIT_ANAL2B: .TRUE.
# ----------------------------------------
@GFDL_1M_CLDMICR_OPTION: GFDL_1M
@GFDL_1M_HYDROSTATIC: @GFDL_HYDRO
@GFDL_1M_USE_BERGERON: .FALSE.
@GFDL_1M_USE_AEROSOL_NN: .FALSE.
###########################################################

###########################################################
Expand Down Expand Up @@ -89,6 +89,19 @@ CLOSURE_CONGESTUS: 3
# ------------------------
###########################################################

###########################################################
# Enable wet scavenging
MTRI_increments::
DU::DU default
SS::SS default
SU::SO4 default
CA.bc::CA.bcphilic default
CA.br::CA.brphilic default
CA.oc::CA.ocphilic default
NI::NO3an1 "NI::NO3an2,NI::NO3an3"
::
###########################################################

###########################################################
# Ocean Model Configuration Parameters
# ------------------------------------
Expand Down
14 changes: 7 additions & 7 deletions HISTORY.AGCM.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -989,15 +989,15 @@ PC@HIST_IMx@HIST_JM-DC.LM: @AGCM_LM
'NH4WT' , 'NI' ,
'NIFLUXU' , 'NI' ,
'NIFLUXV' , 'NI' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'NH3SV' , 'NI' ,
'NH4SV' , 'NI' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3d_aer_p.template: '%y4%m2%d2_%h2%n2z.nc4',
Expand Down
14 changes: 7 additions & 7 deletions HISTORY.rc.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1478,7 +1478,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
# Brown Carbon
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
Expand All @@ -1488,19 +1488,19 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
'CA.brHYPHIL' , 'CA.br' , 'BRHYPHIL' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
# Dust
'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005',
'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005',
'DUDP' , 'DU' , 'DUDP001;DUDP002;DUDP003;DUDP004;DUDP005',
'DUWT' , 'DU' , 'DUWT001;DUWT002;DUWT003;DUWT004;DUWT005',
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
# Seasalt
'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005',
'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005',
'SSDP' , 'SS' , 'SSDP001;SSDP002;SSDP003;SSDP004;SSDP005',
'SSWT' , 'SS' , 'SSWT001;SSWT002;SSWT003;SSWT004;SSWT005',
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
# Sulfates
'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004',
'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004',
Expand All @@ -1516,7 +1516,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SO2EMBB' , 'SU' ,
'SO2EMVN' , 'SU' ,
'SO2EMVE' , 'SU' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
# Organic Carbon
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002' ,
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002' ,
Expand All @@ -1527,7 +1527,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
# Nitrate
'NIPNO3AQ' , 'NI' ,
'NIPNH4AQ' , 'NI' ,
Expand All @@ -1544,7 +1544,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'NH4DP' , 'NI' ,
'NH4WT' , 'NI' ,
'NH4SV' , 'NI' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3_2d_chm_Nx-.format: 'CFIO' ,
Expand Down
28 changes: 14 additions & 14 deletions HISTORY_FP.rc.03z.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1493,7 +1493,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
# Brown Carbon
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
Expand All @@ -1504,7 +1504,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
'CA.brPSOA' , 'CA.br' , 'BRPSOA' ,
'CA.brHYPHIL' , 'CA.br' , 'BRHYPHIL' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
# Dust
'DUEM' , 'DU' , 'DUEM001;DUEM002;DUEM003;DUEM004;DUEM005' ,
'DUSD' , 'DU' , 'DUSD001;DUSD002;DUSD003;DUSD004;DUSD005' ,
Expand All @@ -1513,7 +1513,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'DUEXTTFM' , 'DU' ,
'DUSCATFM' , 'DU' ,
'DUAERIDX' , 'DU' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
# Seasalt
'SSEM' , 'SS' , 'SSEM001;SSEM002;SSEM003;SSEM004;SSEM005' ,
'SSSD' , 'SS' , 'SSSD001;SSSD002;SSSD003;SSSD004;SSSD005' ,
Expand All @@ -1522,7 +1522,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SSEXTTFM' , 'SS' ,
'SSSCATFM' , 'SS' ,
'SSAERIDX' , 'SS' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
# Sulfates
'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004',
'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004',
Expand All @@ -1538,7 +1538,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SO2EMBB' , 'SU' ,
'SO2EMVN' , 'SU' ,
'SO2EMVE' , 'SU' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
# Organic Carbon
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002' ,
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002' ,
Expand All @@ -1549,7 +1549,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
'CA.ocPSOA' , 'CA.oc' , 'OCPSOA' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
# Nitrate
'NIPNO3AQ' , 'NI' ,
'NIPNH4AQ' , 'NI' ,
Expand All @@ -1567,7 +1567,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'NH4DP' , 'NI' ,
'NH4WT' , 'NI' ,
'NH4SV' , 'NI' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

tavg3_2d_chm_Nx-.format: 'CFIO' ,
Expand Down Expand Up @@ -2427,7 +2427,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.bcEMBB' , 'CA.bc' , 'BCEMBB' ,
'CA.bcEMBF' , 'CA.bc' , 'BCEMBF' ,
'CA.bcEMAN' , 'CA.bc' , 'BCEMAN' ,
# 'DBC2gDT' , 'MOIST' , 'BCSV' ,
'MTRI%CA.bc::CA.bcphilicIM' , 'PHYSICS' , 'BCSV' ,
# Brown Carbon
'CA.brEM' , 'CA.br' , 'BREM001;BREM002' ,
'CA.brDP' , 'CA.br' , 'BRDP001;BRDP002' ,
Expand All @@ -2436,7 +2436,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.brEMBB' , 'CA.br' , 'BREMBB' ,
'CA.brEMBF' , 'CA.br' , 'BREMBF' ,
'CA.brEMAN' , 'CA.br' , 'BREMAN' ,
# 'DBRC2gDT' , 'MOIST' , 'BRSV' ,
'MTRI%CA.br::CA.brphilicIM' , 'PHYSICS' , 'BRSV' ,
# Dust
'DUEM' , 'DU' ,
'DUSD' , 'DU' ,
Expand All @@ -2445,7 +2445,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'DUEXTTFM' , 'DU' ,
'DUSCATFM' , 'DU' ,
'DUAERIDX' , 'DU' ,
# 'DDU2gDT' , 'MOIST' , 'DUSV' ,
'MTRI%DU::DUIM' , 'PHYSICS' , 'DUSV' ,
# Seasalt
'SSEM' , 'SS' ,
'SSSD' , 'SS' ,
Expand All @@ -2454,7 +2454,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SSEXTTFM' , 'SS' ,
'SSSCATFM' , 'SS' ,
'SSAERIDX' , 'SS' ,
# 'DSS2gDT' , 'MOIST' , 'SSSV' ,
'MTRI%SS::SSIM' , 'PHYSICS' , 'SSSV' ,
# Sulfates
'SUEM' , 'SU' , 'SUEM001;SUEM002;SUEM003;SUEM004',
'SUSD' , 'SU' , 'SUSD001;SUSD002;SUSD003;SUSD004',
Expand All @@ -2470,7 +2470,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'SO2EMBB' , 'SU' ,
'SO2EMVN' , 'SU' ,
'SO2EMVE' , 'SU' ,
# 'DSU2gDT' , 'MOIST' , 'SUSV' ,
'MTRI%SU::SO4IM' , 'PHYSICS' , 'SUSV' ,
# Organic Carbon
'CA.ocEM' , 'CA.oc' , 'OCEM001;OCEM002',
'CA.ocDP' , 'CA.oc' , 'OCDP001;OCDP002',
Expand All @@ -2480,7 +2480,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'CA.ocEMAN' , 'CA.oc' , 'OCEMAN' ,
'CA.ocEMBG' , 'CA.oc' , 'OCEMBG' ,
'CA.ocHYPHIL' , 'CA.oc' , 'OCHYPHIL' ,
# 'DOC2gDT' , 'MOIST' , 'OCSV' ,
'MTRI%CA.oc::CA.ocphilicIM' , 'PHYSICS' , 'OCSV' ,
# Nitrate
'NIPNO3AQ' , 'NI' ,
'NIPNH4AQ' , 'NI' ,
Expand All @@ -2498,7 +2498,7 @@ COLLECTIONS: 'inst3_3d_asm_Np-'
'NH4DP' , 'NI' ,
'NH4WT' , 'NI' ,
'NH4SV' , 'NI' ,
# 'DNI2gDT' , 'MOIST' , 'NISV' ,
'MTRI%NI::NO3an1IM' , 'PHYSICS' , 'NISV' ,
::

#######################################################################
Expand Down
Loading

0 comments on commit 78ea84f

Please sign in to comment.