Skip to content

Commit c692b43

Browse files
sdrabenhsdrabenh
authored
Merge branch 'feature/sdrabenh/gcm_v12' into bugfix/v12-lnfm-fix
2 parents 5c1c197 + 305afb9 commit c692b43

12 files changed

+282
-79
lines changed

‎AGCM.rc.tmpl‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ SHALLOW_OPTION: UW
113113
# convection scheme options
114114
# ----------------------------------------
115115
CONVPAR_OPTION: @CONVPAR_OPTION
116+
@BACM_1M_USE_GF2020: 0
116117
# Convective plumes to be activated (1 true, 0 false)
117118
DEEP: 1
118119
SHALLOW: 0
@@ -133,6 +134,11 @@ NCAR_NRDG: @NCAR_NRDG
133134
# The below settings are only for v14 BCs currently being tested
134135
#v14 NCAR_EFFGWORO: 0.35
135136
#v14 NCAR_ORO_TNDMAX: 250
137+
138+
# For BACM_1M we revert to v11 TURB settings
139+
@BACM_1M_TURBULENCE_LAMBDAH: 160.0
140+
@BACM_1M_TURBULENCE_LAMBDAM: 160.0
141+
136142
###########################################################
137143

138144
###########################################################
@@ -924,14 +930,17 @@ HCFC22_FRIENDLIES: DYNAMICS:TURBULENCE:MOIST
924930

925931
# Set RADIATION Parameterizations
926932
# -------------------------------
927-
USE_RRTMGP_IRRAD: 1.0
928-
USE_RRTMGP_SORAD: 1.0
929-
RRTMGP_GAS_LW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-gas-lw-g128.nc
930-
RRTMGP_GAS_SW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-gas-sw-g112.nc
931-
RRTMGP_CLOUD_OPTICS_LW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-clouds-lw.nc
932-
RRTMGP_CLOUD_OPTICS_SW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-clouds-sw.nc
933-
934-
SOLAR_LB_MAX_PASSES: 10
933+
@RRTMGP_RADIATION USE_RRTMGP_IRRAD: 1.0
934+
@RRTMGP_RADIATION USE_RRTMGP_SORAD: 1.0
935+
@RRTMGP_RADIATION RRTMGP_GAS_LW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-gas-lw-g128.nc
936+
@RRTMGP_RADIATION RRTMGP_GAS_SW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-gas-sw-g112.nc
937+
@RRTMGP_RADIATION RRTMGP_CLOUD_OPTICS_LW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-clouds-lw.nc
938+
@RRTMGP_RADIATION RRTMGP_CLOUD_OPTICS_SW: ExtData/g5gcm/radiation/RRTMGP/v1.8/rrtmgp-clouds-sw.nc
939+
@RRTMGP_RADIATION SOLAR_LB_MAX_PASSES: 10
940+
941+
@RRTMG_RADIATION USE_RRTMG_IRRAD: 1.0
942+
@RRTMG_RADIATION USE_RRTMG_SORAD: 1.0
943+
935944
ISOLVAR: 2
936945
USE_NRLSSI2: .TRUE.
937946
SOLAR_CYCLE_FILE_NAME: ExtData/g5gcm/solar/NRLSSI2.txt

‎HISTORY.AGCM.rc.tmpl‎

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ PC@CLIM_IMx@CLIM_JM-DC.LM: @AGCM_LM
139139
geosgcm_surf.grid_label: PC@CLIM_IMx@CLIM_JM-DC ,
140140
geosgcm_surf.regrid_method: 'BILINEAR',
141141
geosgcm_surf.mode: 'time-averaged' ,
142-
# geosgcm_surf.monthly: 1 ,
143-
geosgcm_surf.frequency: 030000 ,
144-
geosgcm_surf.ref_time: 210000 ,
142+
geosgcm_surf.monthly: 1 ,
143+
# geosgcm_surf.frequency: 030000 ,
144+
# geosgcm_surf.ref_time: 210000 ,
145145
geosgcm_surf.fields: 'PHIS' , 'AGCM' ,
146146
'SGH' , 'AGCM' ,
147147
'VARFLT' , 'AGCM' ,
@@ -517,6 +517,32 @@ PC@CLIM_IMx@CLIM_JM-DC.LM: @AGCM_LM
517517
'PFL_LSAN' , 'MOIST' ,
518518
'PFI_CN' , 'MOIST' ,
519519
'PFI_LSAN' , 'MOIST' ,
520+
'DQLDT' , 'MOIST' , 'DQLDTMST' ,
521+
'DQIDT' , 'MOIST' , 'DQIDTMST' ,
522+
'DQADT' , 'MOIST' , 'DQADTMST' ,
523+
'DTDT_micro' , 'MOIST' , 'DTDTMICRO' ,
524+
'DQVDT_micro' , 'MOIST' , 'DQVDTMICRO' ,
525+
'DQLDT_micro' , 'MOIST' , 'DQLDTMICRO' ,
526+
'DQIDT_micro' , 'MOIST' , 'DQIDTMICRO' ,
527+
'DQADT_micro' , 'MOIST' , 'DQADTMICRO' ,
528+
'DQRDT_micro' , 'MOIST' , 'DQRDTMICRO' ,
529+
'DQSDT_micro' , 'MOIST' , 'DQSDTMICRO' ,
530+
'DQGDT_micro' , 'MOIST' , 'DQGDTMICRO' ,
531+
'DTDT_macro' , 'MOIST' , 'DTDTMACRO' ,
532+
'DQVDT_macro' , 'MOIST' , 'DQVDTMACRO' ,
533+
'DQLDT_macro' , 'MOIST' , 'DQLDTMACRO' ,
534+
'DQIDT_macro' , 'MOIST' , 'DQIDTMACRO' ,
535+
'DQADT_macro' , 'MOIST' , 'DQADTMACRO' ,
536+
'DTDT_DC' , 'MOIST' , 'DTDTDC' ,
537+
'DQVDT_DC' , 'MOIST' , 'DQVDTDC' ,
538+
'DQLDT_DC' , 'MOIST' , 'DQLDTDC' ,
539+
'DQIDT_DC' , 'MOIST' , 'DQIDTDC' ,
540+
'DQADT_DC' , 'MOIST' , 'DQADTDC' ,
541+
'DTDT_SC' , 'MOIST' , 'DTDTSC' ,
542+
'DQVDT_SC' , 'MOIST' , 'DQVDTSC' ,
543+
'DQLDT_SC' , 'MOIST' , 'DQLDTSC' ,
544+
'DQIDT_SC' , 'MOIST' , 'DQIDTSC' ,
545+
'DQADT_SC' , 'MOIST' , 'DQADTSC' ,
520546
::
521547

522548
geosgcm_turb.template: '%y4%m2%d2_%h2%n2z.nc4' ,

‎gcm_forecast.tmpl‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -678,16 +678,14 @@ if( $EXTDATA2G_TRUE == 1 ) then
678678

679679
endif
680680

681-
# Move GOCART to use RRTMGP Bands
682-
# -------------------------------
683-
# UNCOMMENT THE LINES BELOW IF RUNNING RRTMGP
684-
#
685-
set instance_files = `/bin/ls -1 *_instance*.rc`
686-
foreach instance ($instance_files)
687-
/bin/mv $instance $instance.tmp
688-
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
689-
/bin/rm $instance.tmp
690-
end
681+
@RRTMGP_RADIATION # Move GOCART to use RRTMGP Bands
682+
@RRTMGP_RADIATION # -------------------------------
683+
@RRTMGP_RADIATION set instance_files = `/bin/ls -1 *_instance*.rc`
684+
@RRTMGP_RADIATION foreach instance ($instance_files)
685+
@RRTMGP_RADIATION /bin/mv $instance $instance.tmp
686+
@RRTMGP_RADIATION cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
687+
@RRTMGP_RADIATION /bin/rm $instance.tmp
688+
@RRTMGP_RADIATION end
691689

692690
# Link Boundary Conditions for Appropriate Date
693691
# ---------------------------------------------

‎gcm_regress.j‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -403,16 +403,14 @@ if( $LM != 72 ) then
403403
endif
404404
endif
405405

406-
# Move GOCART to use RRTMGP Bands
407-
# -------------------------------
408-
# UNCOMMENT THE LINES BELOW IF RUNNING RRTMGP
409-
#
410-
set instance_files = `/bin/ls -1 *_instance*.rc`
411-
foreach instance ($instance_files)
412-
/bin/mv $instance $instance.tmp
413-
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
414-
/bin/rm $instance.tmp
415-
end
406+
@RRTMGP_RADIATION # Move GOCART to use RRTMGP Bands
407+
@RRTMGP_RADIATION # -------------------------------
408+
@RRTMGP_RADIATION set instance_files = `/bin/ls -1 *_instance*.rc`
409+
@RRTMGP_RADIATION foreach instance ($instance_files)
410+
@RRTMGP_RADIATION /bin/mv $instance $instance.tmp
411+
@RRTMGP_RADIATION cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
412+
@RRTMGP_RADIATION /bin/rm $instance.tmp
413+
@RRTMGP_RADIATION end
416414

417415
# If REPLAY, link necessary forcing files
418416
# ---------------------------------------

‎gcm_run.j‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -879,16 +879,14 @@ if( $EXTDATA2G_TRUE == 1 ) then
879879
880880
endif
881881
882-
# Move GOCART to use RRTMGP Bands
883-
# -------------------------------
884-
# UNCOMMENT THE LINES BELOW IF RUNNING RRTMGP
885-
#
886-
set instance_files = `/bin/ls -1 *_instance*.rc`
887-
foreach instance ($instance_files)
888-
/bin/mv $instance $instance.tmp
889-
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
890-
/bin/rm $instance.tmp
891-
end
882+
@RRTMGP_RADIATION # Move GOCART to use RRTMGP Bands
883+
@RRTMGP_RADIATION # -------------------------------
884+
@RRTMGP_RADIATION set instance_files = `/bin/ls -1 *_instance*.rc`
885+
@RRTMGP_RADIATION foreach instance ($instance_files)
886+
@RRTMGP_RADIATION /bin/mv $instance $instance.tmp
887+
@RRTMGP_RADIATION cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
888+
@RRTMGP_RADIATION /bin/rm $instance.tmp
889+
@RRTMGP_RADIATION end
892890
893891
# Link Boundary Conditions for Appropriate Date
894892
# ---------------------------------------------

‎gcm_run.j-new_rst_approach‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -805,16 +805,14 @@ if( $EXTDATA2G_TRUE == 1 ) then
805805
806806
endif
807807
808-
# Move GOCART to use RRTMGP Bands
809-
# -------------------------------
810-
# UNCOMMENT THE LINES BELOW IF RUNNING RRTMGP
811-
#
812-
set instance_files = `/bin/ls -1 *_instance*.rc`
813-
foreach instance ($instance_files)
814-
/bin/mv $instance $instance.tmp
815-
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
816-
/bin/rm $instance.tmp
817-
end
808+
@RRTMGP_RADIATION # Move GOCART to use RRTMGP Bands
809+
@RRTMGP_RADIATION # -------------------------------
810+
@RRTMGP_RADIATION set instance_files = `/bin/ls -1 *_instance*.rc`
811+
@RRTMGP_RADIATION foreach instance ($instance_files)
812+
@RRTMGP_RADIATION /bin/mv $instance $instance.tmp
813+
@RRTMGP_RADIATION cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
814+
@RRTMGP_RADIATION /bin/rm $instance.tmp
815+
@RRTMGP_RADIATION end
818816
819817
# Link Boundary Conditions for Appropriate Date
820818
# ---------------------------------------------

‎gcm_run_benchmark.j‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -695,16 +695,14 @@ if( $EXTDATA2G_TRUE == 1 ) then
695695

696696
endif
697697

698-
# Move GOCART to use RRTMGP Bands
699-
# -------------------------------
700-
# UNCOMMENT THE LINES BELOW IF RUNNING RRTMGP
701-
#
702-
set instance_files = `/bin/ls -1 *_instance*.rc`
703-
foreach instance ($instance_files)
704-
/bin/mv $instance $instance.tmp
705-
cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
706-
/bin/rm $instance.tmp
707-
end
698+
@RRTMGP_RADIATION # Move GOCART to use RRTMGP Bands
699+
@RRTMGP_RADIATION # -------------------------------
700+
@RRTMGP_RADIATION set instance_files = `/bin/ls -1 *_instance*.rc`
701+
@RRTMGP_RADIATION foreach instance ($instance_files)
702+
@RRTMGP_RADIATION /bin/mv $instance $instance.tmp
703+
@RRTMGP_RADIATION cat $instance.tmp | sed -e '/\bRRTMG\b/ s#RRTMG#RRTMGP#' > $instance
704+
@RRTMGP_RADIATION /bin/rm $instance.tmp
705+
@RRTMGP_RADIATION end
708706

709707
# Link Boundary Conditions for Appropriate Date
710708
# ---------------------------------------------

‎gcm_setup‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -299,25 +299,46 @@ set LATLON_AGCM = "#DELETE"
299299
set CUBE_AGCM = ""
300300

301301
echo "Enter the Atmospheric Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 181)"
302+
echo " NOTE: If you choose 72 levels, your defaults will change to match GEOSgcm v11:"
303+
echo " - Microphysics will change to BACM_1M"
304+
echo " - Land surface model boundary conditions will change to NL3"
305+
echo " - Radiation will be set to RRTMG"
306+
echo " - Default heartbeat will be set to 450 seconds"
302307
set AGCM_LM = $<
303308
if( .$AGCM_LM == . ) then
304309
set AGCM_LM = 181
305310
endif
306311

312+
#######################################################################
313+
# Set Radiation model
314+
#######################################################################
315+
316+
if ( $AGCM_LM == 72 ) then
317+
set RRTMG_RADIATION = ""
318+
set RRTMGP_RADIATION = "#DELETE"
319+
else
320+
set RRTMG_RADIATION = "#DELETE"
321+
set RRTMGP_RADIATION = ""
322+
endif
307323

308324
#######################################################################
309325
# Choose microphysics option
310326
#######################################################################
311327

312328
ASKMP:
313329

314-
echo "Enter Choice for Atmospheric Model ${C1}Microphysics${CN}: (Default: GFDL_1M)"
330+
set DEFAULT_CLDMICRO = "GFDL_1M"
331+
if ( $AGCM_LM == 72 ) then
332+
set DEFAULT_CLDMICRO = "BACM_1M"
333+
endif
334+
335+
echo "Enter Choice for Atmospheric Model ${C1}Microphysics${CN}: (Default: ${C2}$DEFAULT_CLDMICRO${CN})"
315336
echo " ${C2}BACM_1M -- 3-phase 1-moment Bacmeister et al${CN}"
316337
echo " ${C2}GFDL_1M -- 6-phase 1-moment Geophysical Fluid Dynamics Laboratory${CN}"
317338
echo " ${C2}MGB2_2M -- 5 or 6-phase 2-moment Morrison & Gettleman${CN}"
318339
set CLDMICRO = $<
319340
if( .$CLDMICRO == . ) then
320-
set CLDMICRO = "GFDL_1M"
341+
set CLDMICRO = $DEFAULT_CLDMICRO
321342
else
322343
set CLDMICRO = `echo $CLDMICRO | tr "[:lower:]" "[:upper:]"`
323344
if( "$CLDMICRO" != "BACM_1M" & \
@@ -1072,9 +1093,18 @@ if ($DATA_ATMOS == TRUE) then
10721093
set GWD_IN_BCS = "FALSE"
10731094
else
10741095

1075-
echo "Enter the choice of ${C1}Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${C2}NL3${CN} (Icarus-NLv3), ${C2}v14${CN} (v14_BETA) or ${C2}v12${CN} (Default)"
1096+
set DEFAULT_LSM_BCS = "v12"
1097+
set LSM_BCS_V12_DEFAULT_STR = "${C2}v12${CN} (Default)"
1098+
set LSM_BCS_NL3_DEFAULT_STR = "${C2}NL3${CN} (Icarus-NLv3)"
1099+
if ( $AGCM_LM == 72 ) then
1100+
set DEFAULT_LSM_BCS = "NL3"
1101+
set LSM_BCS_V12_DEFAULT_STR = "${C2}v12${CN}"
1102+
set LSM_BCS_NL3_DEFAULT_STR = "${C2}NL3${CN} (Icarus-NLv3, Default)"
1103+
endif
1104+
1105+
echo "Enter the choice of ${C1}Land Surface Boundary Conditions${CN} using: ${C2}ICA${CN} (Icarus), ${LSM_BCS_NL3_DEFAULT_STR}, ${C2}v14${CN} (v14_BETA) or ${LSM_BCS_V12_DEFAULT_STR}"
10761106
set LSM_BCS = $<
1077-
if( .$LSM_BCS == . ) set LSM_BCS = "v12"
1107+
if( .$LSM_BCS == . ) set LSM_BCS = ${DEFAULT_LSM_BCS}
10781108
if( `echo $LSM_BCS | tr '[:upper:]' '[:lower:]'` == "ica" ) then
10791109
set LSM_BCS = "ICA"
10801110
set LSM_PARMS = "#DELETE"
@@ -2190,7 +2220,7 @@ s?@BACM_1M_?$BACM_1M_?g
21902220
s?@GFDL_1M_?$GFDL_1M_?g
21912221
s?@MGB2_2M_?$MGB2_2M_?g
21922222
2193-
s?@KLID?$KLID?g
2223+
s?@KLID?$KLID?g
21942224
21952225
s?@PRELOAD_COMMAND?$PRELOAD_COMMAND?g
21962226
s?@LD_LIBRARY_PATH_CMD?$LD_LIBRARY_PATH_CMD?g
@@ -2199,6 +2229,9 @@ s?@RUN_CMD?$RUN_CMD?g
21992229
s?@MODELATM?$MODELATM?g
22002230
s?@USE_DATA_ATM4OCN?$USE_DATA_ATM4OCN?g
22012231
2232+
s?@RRTMG_RADIATION?$RRTMG_RADIATION?g
2233+
s?@RRTMGP_RADIATION?$RRTMGP_RADIATION?g
2234+
22022235
EOF
22032236

22042237
# Added FV3/GFDL-MP Specific Parameters
@@ -2447,6 +2480,11 @@ if( $LSM_BCS == "ICA" ) then
24472480
awk '{ if ($1~"Z0_FORMULATION:") { sub(/4/,"2") }; print }' > $EXPDIR/RC/GEOS_SurfaceGridComp.rc
24482481
endif
24492482

2483+
if( $AGCM_LM == 72 ) then
2484+
/bin/mv $EXPDIR/RC/GEOS_SurfaceGridComp.rc $EXPDIR/RC/GEOS_SurfaceGridComp.tmp
2485+
cat $EXPDIR/RC/GEOS_SurfaceGridComp.tmp | sed -e '/^ *SNOW_ALBEDO_INFO:/ s/1/0/' > $EXPDIR/RC/GEOS_SurfaceGridComp.rc
2486+
endif
2487+
24502488
# Enable DATA_DRIVEN GOCART2G
24512489
# ---------------------------
24522490
if( $AERO_PROVIDER == GOCART2G ) then

0 commit comments

Comments
 (0)