Skip to content

Commit

Permalink
Merge branch 'develop' into nohamp_submodule3
Browse files Browse the repository at this point in the history
  • Loading branch information
@davegill
davegill authored Jan 26, 2022
2 parents db0adb8 + aa9f3b6 commit 2bc9fc5
Show file tree
Hide file tree
Showing 29 changed files with 466,287 additions and 119,480 deletions.
16 changes: 8 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,6 @@ wrf : framework_only
if [ $(ESMF_COUPLING) -eq 1 ] ; then \
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em em_wrf_SST_ESMF ) ; \
fi
if [ ! -f run/p3_lookupTable_1.dat-5.3-3momI ] ; then \
( cd run ; cp p3_lookupTable_1.dat-5.3-3momI.gz hold.gz ; \
gunzip hold.gz ; mv hold p3_lookupTable_1.dat-5.3-3momI ) ; \
fi
@echo "build started: $(START_OF_COMPILE)"
@echo "build completed:" `date`

Expand Down Expand Up @@ -590,8 +586,8 @@ em_real : wrf
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookupTable_1.dat-5.3-2momI . ; \
ln -sf ../../run/p3_lookupTable_1.dat-5.3-3momI . ; \
ln -sf ../../run/p3_lookupTable_2.dat-2momI_v5.2.2 . ; \
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.7 . ; \
ln -sf ../../run/p3_lookupTable_2.dat-2momI_v5.2.3 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
Expand Down Expand Up @@ -672,8 +668,8 @@ em_real : wrf
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookupTable_1.dat-5.3-2momI . ; \
ln -sf ../../run/p3_lookupTable_1.dat-5.3-3momI . ; \
ln -sf ../../run/p3_lookupTable_2.dat-2momI_v5.2.2 . ; \
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.7 . ; \
ln -sf ../../run/p3_lookupTable_2.dat-2momI_v5.2.3 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
Expand Down Expand Up @@ -1030,6 +1026,10 @@ physics :
@ echo '--------------------------------------'
if [ $(WRF_CHEM) -eq 0 ] ; then \
( cd phys ; $(MAKE) submodules ; $(MAKE) CF2=" " ) ; \
if [ $(WRF_CMAQ) -eq 1 ] ; then \
@ echo '----------- make cmaq ----------------' ; \
( rm -f main/libcmaqlib.a; cd cmaq ; $(MAKE) -f Makefile.twoway ) ; \
fi \
else \
( cd phys ; $(MAKE) submodules ; $(MAKE) CF2="$(CHEM_FILES2)" ) ; \
fi
Expand Down
20 changes: 10 additions & 10 deletions Registry/Registry.EM_COMMON
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1138,16 +1138,16 @@ state real DTAUX3D ikj misc 1 - rh "DT
state real DTAUY3D ikj misc 1 - rh "DTAUY3D" "LOCAL V GWDO STRESS" "m s-1"
state real DUSFCG ij misc 1 - rh "DUSFCG" "COLUMN-INTEGRATED U GWDO STRESS" "Pa m s-1"
state real DVSFCG ij misc 1 - rh "DVSFCG" "COLUMN-INTEGRATED V GWDO STRESS" "Pa m s-1"
state real VAR2D ij misc 1 - i012rhd "VAR" "OROGRAPHIC VARIANCE" "" ""
state real OC12D ij misc 1 - i012rhd "CON" "OROGRAPHIC CONVEXITY" "" ""
state real OA1 ij misc 1 - i012rhd "OA1" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OA2 ij misc 1 - i012rhd "OA2" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OA3 ij misc 1 - i012rhd "OA3" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OA4 ij misc 1 - i012rhd "OA4" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OL1 ij misc 1 - i012rhd "OL1" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OL2 ij misc 1 - i012rhd "OL2" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OL3 ij misc 1 - i012rhd "OL3" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real OL4 ij misc 1 - i012rhd "OL4" "OROGRAPHIC DIRECTION ASYMMETRY FUNCTION" "" ""
state real VAR2D ij misc 1 - i012rhd "VAR" "STANDARD DEVIATION OF SUBGRID-SCALE OROGRAPHY" "m"
state real OC12D ij misc 1 - i012rhd "CON" "OROGRAPHIC CONVEXITY" ""
state real OA1 ij misc 1 - i012rhd "OA1" "ASYMMETRY OF SUBGRID-SCALE OROGRAPHY FOR WESTERLY FLOW" ""
state real OA2 ij misc 1 - i012rhd "OA2" "ASYMMETRY OF SUBGRID-SCALE OROGRAPHY FOR SOUTHERLY FLOW" ""
state real OA3 ij misc 1 - i012rhd "OA3" "ASYMMETRY OF SUBGRID-SCALE OROGRAPHY FOR SOUTH-WESTERLY FLOW" ""
state real OA4 ij misc 1 - i012rhd "OA4" "ASYMMETRY OF SUBGRID-SCALE OROGRAPHY FOR NORTH-WESTERLY FLOW" ""
state real OL1 ij misc 1 - i012rhd "OL1" "NON-DIMENSIONAL EFFECTIVE OROGRAPHIC LENGTH FOR WESTERLY FLOW" ""
state real OL2 ij misc 1 - i012rhd "OL2" "NON-DIMENSIONAL EFFECTIVE OROGRAPHIC LENGTH FOR SOUTHERLY FLOW" ""
state real OL3 ij misc 1 - i012rhd "OL3" "NON-DIMENSIONAL EFFECTIVE OROGRAPHIC LENGTH FOR SOUTH-WESTERLY FLOW" ""
state real OL4 ij misc 1 - i012rhd "OL4" "NON-DIMENSIONAL EFFECTIVE OROGRAPHIC LENGTH FOR NORTH-WESTERLY FLOW" ""

# Additional for GSL gravity wave drag suite
state real DTAUX3D_ls ikj misc 1 - rh "DTAUX3D_ls" "LOCAL U GWDO STRESS LARGE-SCALE" "m s-1"
Expand Down
59 changes: 59 additions & 0 deletions Registry/registry.CMAQ
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# WRF-CMAQ coupled model
rconfig integer wrf_cmaq_option namelist,wrf_cmaq 1 0
rconfig integer wrf_cmaq_freq namelist,wrf_cmaq 1 1
rconfig integer met_file_tstep namelist,wrf_cmaq 1 10000

rconfig logical direct_sw_feedback namelist,wrf_cmaq 1 .false.
rconfig logical feedback_restart namelist,wrf_cmaq 1 .false.

#state real mass_ws_i ikj twoway_feedback_data 1 - r "mass_ws_i" "Water soluble i mode" "ug/m**3"
#state real mass_ws_j ikj twoway_feedback_data 1 - r "mass_ws_j" "Water soluble j mode" "ug/m**3"
#state real mass_ws_k ikj twoway_feedback_data 1 - r "mass_ws_k" "Water soluble k mode" "ug/m**3"
#state real mass_in_i ikj twoway_feedback_data 1 - r "mass_in_i" "Water insoluble i mode" "ug/m**3"
#state real mass_in_j ikj twoway_feedback_data 1 - r "mass_in_j" "Water insoluble j mode" "ug/m**3"
#state real mass_in_k ikj twoway_feedback_data 1 - r "mass_in_k" "Water insoluble k mode" "ug/m**3"
#state real mass_ec_i ikj twoway_feedback_data 1 - r "mass_ec_i" "Elemental carbon i mode" "ug/m**3"
#state real mass_ec_j ikj twoway_feedback_data 1 - r "mass_ec_j" "Elemental carbon j mode" "ug/m**3"
#state real mass_ec_k ikj twoway_feedback_data 1 - r "mass_ec_k" "Elemental carbon k mode" "ug/m**3"
#state real mass_ss_i ikj twoway_feedback_data 1 - r "mass_ss_i" "Seasalt i mode" "ug/m**3"
#state real mass_ss_j ikj twoway_feedback_data 1 - r "mass_ss_j" "Seasalt j mode" "ug/m**3"
#state real mass_ss_k ikj twoway_feedback_data 1 - r "mass_ss_k" "Seasalt k mode" "ug/m**3"
#state real mass_h2o_i ikj twoway_feedback_data 1 - r "mass_h2o_i" "water i mode" "ug/m**3"
#state real mass_h2o_j ikj twoway_feedback_data 1 - r "mass_h2o_j" "water j mode" "ug/m**3"
#state real mass_h2o_k ikj twoway_feedback_data 1 - r "mass_h2o_k" "water k mode" "ug/m**3"
#state real dgn_i ikj twoway_feedback_data 1 - r "dgn_i" "diameter i mode" "m"
#state real dgn_j ikj twoway_feedback_data 1 - r "dgn_j" "diameter j mode" "m"
#state real dgn_k ikj twoway_feedback_data 1 - r "dgn_k" "diameter k mode" "m"
#state real sig_i ikj twoway_feedback_data 1 - r "sig_i" "standard deviations i mode" ""
#state real sig_j ikj twoway_feedback_data 1 - r "sig_j" "standard deviations j mode" ""
#state real sig_k ikj twoway_feedback_data 1 - r "sig_k" "standard deviations k mode" ""

#state real prev_rainnc ij twoway_feedback_data 1 - r "prev_rainnc" "previous accumlated rainnc" "mm"
#state real prev_rainc ij twoway_feedback_data 1 - r "prev_rainc" "previous accumlated rainc" "mm"

#state real ozone ikj twoway_feedback_data 1 - r "OZONE" "ozone value" ""

#state real sw_gtauxar_01 ikj misc 1 - hr "SW_GTAUXAR_01" "SW Optical depth of lamda = 0.388 um" ""
#state real sw_gtauxar_02 ikj misc 1 - hr "SW_GTAUXAR_02" "SW Optical depth of lamda = 0.533 um" ""
#state real sw_gtauxar_03 ikj misc 1 - hr "SW_GTAUXAR_03" "SW Optical depth of lamda = 0.702 um" ""
#state real sw_gtauxar_04 ikj misc 1 - hr "SW_GTAUXAR_04" "SW Optical depth of lamda = 1.010 um" ""
#state real sw_gtauxar_05 ikj misc 1 - hr "SW_GTAUXAR_05" "SW Optical depth of lamda = 1.271 um" ""
#state real sw_ttauxar_01 ij misc 1 - hr "SW_TTAUXAR_01" "Optical depth sum of SW_GTAUXAR_01" ""
#state real sw_ttauxar_02 ij misc 1 - hr "SW_TTAUXAR_02" "Optical depth sum of SW_GTAUXAR_02" ""
#state real sw_ttauxar_03 ij misc 1 - hr "SW_TTAUXAR_03" "Optical depth sum of SW_GTAUXAR_03" ""
#state real sw_ttauxar_04 ij misc 1 - hr "SW_TTAUXAR_04" "Optical depth sum of SW_GTAUXAR_04" ""
#state real sw_ttauxar_05 ij misc 1 - hr "SW_TTAUXAR_05" "Optical depth sum of SW_GTAUXAR_05" ""
#state real sw_asy_fac_01 ikj misc 1 - hr "SW_ASY_FAC_01" "Corresponding Asymmetry Factor of SW_GTAUXAR_01" ""
#state real sw_asy_fac_02 ikj misc 1 - hr "SW_ASY_FAC_02" "Corresponding Asymmetry Factor of SW_GTAUXAR_02" ""
#state real sw_asy_fac_03 ikj misc 1 - hr "SW_ASY_FAC_03" "Corresponding Asymmetry Factor of SW_GTAUXAR_03" ""
#state real sw_asy_fac_04 ikj misc 1 - hr "SW_ASY_FAC_04" "Corresponding Asymmetry Factor of SW_GTAUXAR_04" ""
#state real sw_asy_fac_05 ikj misc 1 - hr "SW_ASY_FAC_05" "Corresponding Asymmetry Factor of SW_GTAUXAR_05" ""
#state real sw_ssa_01 ikj misc 1 - hr "SW_SSA_01" "Corresponding Single scattering Albedo of SW_GTAUXAR_01" ""
#state real sw_ssa_02 ikj misc 1 - hr "SW_SSA_02" "Corresponding Single scattering Albedo of SW_GTAUXAR_02" ""
#state real sw_ssa_03 ikj misc 1 - hr "SW_SSA_03" "Corresponding Single scattering Albedo of SW_GTAUXAR_03" ""
#state real sw_ssa_04 ikj misc 1 - hr "SW_SSA_04" "Corresponding Single scattering Albedo of SW_GTAUXAR_04" ""
#state real sw_ssa_05 ikj misc 1 - hr "SW_SSA_05" "Corresponding Single scattering Albedo of SW_GTAUXAR_05" ""

#state real sw_zbbcddir ij misc 1 - hr "SW_ZBBCDDIR" "Clear sky downward direct shortwave flux" "W m-2"
#state real sw_dirdflux ij misc 1 - hr "SW_DIRDFLUX" "Direct downward shortwave surface flux" "W m-2"
#state real sw_difdflux ij misc 1 - hr "SW_DIFDFLUX" "Diffuse downward shortwave surface flux" "W m-2"
1 change: 1 addition & 0 deletions Registry/registry.em_shared_collection
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ include registry.new3d_wif
include registry.trad_fields
include registry.solar_fields
include registry.diags
include registry.CMAQ
Loading

0 comments on commit 2bc9fc5

Please sign in to comment.