Skip to content

Commit 127b5ea

Browse files
ewquonewquon
authored
Merge pull request #42 from a2e-mmc/mmc_update_v4.3
MMC update to v4.3
2 parents d1c2ebf + 87811b4 commit 127b5ea

File tree

483 files changed

+137972
-61587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

483 files changed

+137972
-61587
lines changed

‎.gitignore

+13-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,19 @@
1010
# USE CAUTION WHEN ADDING WILDCARDS, as some builds use different filename #
1111
# conventions than others #
1212
##############################################################################
13+
configure.wrf*
1314
*.exe
14-
*.o
15+
*.f90
16+
*.inc
1517
*.mod
18+
*.h
19+
*.c
20+
*.o
1621
*.a
17-
configure.wrf*
18-
*.backup
19-
*.f90
22+
*.log
23+
tags
24+
tools/*
25+
external/*
26+
run/*
27+
test/*
28+
log*

‎Makefile

+38-11
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,10 @@ wrf : framework_only
121121
if [ $(ESMF_COUPLING) -eq 1 ] ; then \
122122
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em em_wrf_SST_ESMF ) ; \
123123
fi
124+
if [ ! -f run/p3_lookupTable_1.dat-3momI_v5.1.6 ] ; then \
125+
( cd run ; cp p3_lookupTable_1.dat-3momI_v5.1.6.gz hold.gz ; \
126+
gunzip hold.gz ; mv hold p3_lookupTable_1.dat-3momI_v5.1.6 ) ; \
127+
fi
124128
@echo "build started: $(START_OF_COMPILE)"
125129
@echo "build completed:" `date`
126130

@@ -151,7 +155,7 @@ all_wrfvar :
151155
fi
152156
if [ $(BUFR) ] ; then \
153157
(cd var/external/bufr; \
154-
$(MAKE) $(J) FC="$(SFC)" CC="$(SCC)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" FFLAGS="$(FCOPTIM) $(FORMAT_FIXED)" RANLIB="$(RANLIB)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) ; \
158+
$(MAKE) $(J) FC="$(SFC)" CC="$(SCC)" CPP="$(CPP)" CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" FFLAGS="$(FCOPTIM) $(FORMAT_FIXED) $(FCCOMPAT)" RANLIB="$(RANLIB)" AR="$(AR)" ARFLAGS="$(ARFLAGS)" ) ; \
155159
fi
156160
### Use 'make' to avoid '-i -r' above:
157161
if [ $(WAVELET) ] ; then \
@@ -396,7 +400,9 @@ em_seabreeze2d_x : wrf
396400
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal )
397401
( cd test/em_seabreeze2d_x ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
398402
( cd test/em_seabreeze2d_x ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
399-
( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
403+
( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
404+
ln -sf ../../run/LANDUSE.TBL . ; \
405+
ln -sf ../../run/RRTM_DATA . )
400406
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
401407
( cd run ; if test -f namelist.input ; then \
402408
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
@@ -427,7 +433,13 @@ em_convrad : wrf
427433
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal )
428434
( cd test/em_convrad ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
429435
( cd test/em_convrad ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
430-
( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
436+
( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
437+
ln -sf ../../run/LANDUSE.TBL . ; \
438+
ln -sf ../../run/RRTMG_LW_DATA . ; \
439+
ln -sf ../../run/RRTMG_SW_DATA . ; \
440+
ln -sf ../../run/ozone.formatted . ; \
441+
ln -sf ../../run/ozone_lat.formatted . ; \
442+
ln -sf ../../run/ozone_plev.formatted . )
431443
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
432444
( cd run ; if test -f namelist.input ; then \
433445
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
@@ -443,7 +455,8 @@ em_tropical_cyclone : wrf
443455
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=tropical_cyclone em_ideal )
444456
( cd test/em_tropical_cyclone ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
445457
( cd test/em_tropical_cyclone ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
446-
( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
458+
( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
459+
ln -sf ../../run/LANDUSE.TBL . )
447460
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
448461
( cd run ; if test -f namelist.input ; then \
449462
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
@@ -476,7 +489,12 @@ em_scm_xy : wrf
476489
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=scm_xy em_ideal )
477490
( cd test/em_scm_xy ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
478491
( cd test/em_scm_xy ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
479-
( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
492+
( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \
493+
ln -sf ../../run/GENPARM.TBL . ; \
494+
ln -sf ../../run/LANDUSE.TBL . ; \
495+
ln -sf ../../run/SOILPARM.TBL . ; \
496+
ln -sf ../../run/VEGPARM.TBL . ; \
497+
ln -sf ../../run/RRTM_DATA . )
480498
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
481499
( cd run ; if test -f namelist.input ; then \
482500
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
@@ -555,9 +573,11 @@ em_real : wrf
555573
ln -sf ../../run/aerosol_lat.formatted . ; \
556574
ln -sf ../../run/aerosol_lon.formatted . ; \
557575
ln -sf ../../run/aerosol_plev.formatted . ; \
576+
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
558577
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
559-
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
560-
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
578+
ln -sf ../../run/p3_lookupTable_1.dat-2momI_v5.1.6_oldDimax . ; \
579+
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.6 . ; \
580+
ln -sf ../../run/p3_lookupTable_2.dat-4.1 . ; \
561581
ln -sf ../../run/HLC.TBL . ; \
562582
ln -sf ../../run/wind-turbine-1.tbl . ; \
563583
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
@@ -575,6 +595,7 @@ em_real : wrf
575595
( cd test/em_esmf_exp ; /bin/rm -f LANDUSE.TBL ; ln -s ../../run/LANDUSE.TBL . ) ; \
576596
( cd test/em_esmf_exp ; /bin/rm -f SOILPARM.TBL ; ln -s ../../run/SOILPARM.TBL . ) ; \
577597
( cd test/em_esmf_exp ; /bin/rm -f URBPARM.TBL ; ln -s ../../run/URBPARM.TBL . ) ; \
598+
( cd test/em_esmf_exp ; /bin/rm -f URBPARM_LCZ.TBL ; ln -s ../../run/URBPARM_LCZ.TBL . ) ; \
578599
( cd test/em_esmf_exp ; /bin/rm -f VEGPARM.TBL ; ln -s ../../run/VEGPARM.TBL . ) ; \
579600
( cd test/em_esmf_exp ; /bin/rm -f MPTABLE.TBL ; ln -s ../../run/MPTABLE.TBL . ) ; \
580601
( cd test/em_esmf_exp ; /bin/rm -f tr49t67 ; ln -s ../../run/tr49t67 . ) ; \
@@ -587,6 +608,7 @@ em_real : wrf
587608
( cd test/em_real ; /bin/rm -f tc.exe ; ln -s ../../main/tc.exe . )
588609
( cd test/em_real ; /bin/rm -f ndown.exe ; ln -s ../../main/ndown.exe . )
589610
( cd test/em_real ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
611+
( cd test/em_real ; /bin/rm -f README.physics_files ; ln -s ../../run/README.physics_files . )
590612
( cd test/em_real ; /bin/rm -f ETAMPNEW_DATA.expanded_rain ETAMPNEW_DATA RRTM_DATA RRTMG_LW_DATA RRTMG_SW_DATA ; \
591613
ln -sf ../../run/ETAMPNEW_DATA . ; \
592614
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain . ; \
@@ -616,6 +638,7 @@ em_real : wrf
616638
ln -sf ../../run/aerosol_lat.formatted . ; \
617639
ln -sf ../../run/aerosol_lon.formatted . ; \
618640
ln -sf ../../run/aerosol_plev.formatted . ; \
641+
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
619642
ln -sf ../../run/capacity.asc . ; \
620643
ln -sf ../../run/coeff_p.asc . ; \
621644
ln -sf ../../run/coeff_q.asc . ; \
@@ -627,8 +650,9 @@ em_real : wrf
627650
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
628651
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
629652
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
630-
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
631-
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
653+
ln -sf ../../run/p3_lookupTable_1.dat-2momI_v5.1.6_oldDimax . ; \
654+
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.6 . ; \
655+
ln -sf ../../run/p3_lookupTable_2.dat-4.1 . ; \
632656
ln -sf ../../run/HLC.TBL . ; \
633657
ln -sf ../../run/wind-turbine-1.tbl . ; \
634658
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
@@ -650,6 +674,7 @@ em_real : wrf
650674
( cd test/em_real ; /bin/rm -f LANDUSE.TBL ; ln -s ../../run/LANDUSE.TBL . )
651675
( cd test/em_real ; /bin/rm -f SOILPARM.TBL ; ln -s ../../run/SOILPARM.TBL . )
652676
( cd test/em_real ; /bin/rm -f URBPARM.TBL ; ln -s ../../run/URBPARM.TBL . )
677+
( cd test/em_real ; /bin/rm -f URBPARM_LCZ.TBL ; ln -s ../../run/URBPARM_LCZ.TBL . )
653678
( cd test/em_real ; /bin/rm -f VEGPARM.TBL ; ln -s ../../run/VEGPARM.TBL . )
654679
( cd test/em_real ; /bin/rm -f MPTABLE.TBL ; ln -s ../../run/MPTABLE.TBL . )
655680
( cd test/em_real ; /bin/rm -f tr49t67 ; ln -s ../../run/tr49t67 . )
@@ -910,6 +935,7 @@ nmm_real : nmm_wrf
910935
ln -sf ../../run/aerosol_lat.formatted . ; \
911936
ln -sf ../../run/aerosol_lon.formatted . ; \
912937
ln -sf ../../run/aerosol_plev.formatted . ; \
938+
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
913939
ln -sf ../../run/capacity.asc . ; \
914940
ln -sf ../../run/coeff_p.asc . ; \
915941
ln -sf ../../run/coeff_q.asc . ; \
@@ -921,8 +947,9 @@ nmm_real : nmm_wrf
921947
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
922948
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
923949
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
924-
ln -sf ../../run/p3_lookup_table_1.dat-v4.1 . ; \
925-
ln -sf ../../run/p3_lookup_table_2.dat-v4.1 . ; \
950+
ln -sf ../../run/p3_lookupTable_1.dat-2momI_v5.1.6_oldDimax . ; \
951+
ln -sf ../../run/p3_lookupTable_1.dat-3momI_v5.1.6 . ; \
952+
ln -sf ../../run/p3_lookupTable_2.dat-4.1 . ; \
926953
ln -sf ../../run/HLC.TBL . ; \
927954
ln -sf ../../run/wind-turbine-1.tbl . ; \
928955
ln -sf ../../run/ishmael-gamma-tab.bin . ; \

‎README

+10-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
WRF Model Version 4.2.1
1+
WRF Model Version 4.3
22

3-
http://www2.mmm.ucar.edu/wrf/users/
3+
https://www2.mmm.ucar.edu/wrf/users/
44

55
------------------------
66
WRF PUBLIC DOMAIN NOTICE
@@ -29,18 +29,21 @@ This is the main directory for the WRF Version 4 source code release.
2929
======================================
3030

3131
Other README files are located in the WRF/doc directory:
32+
doc/README.crtm
33+
doc/README.CTSM
34+
doc/README.cygwin.md
3235
doc/README.DA
33-
doc/README.NMM
34-
doc/README.SSIB
35-
doc/README.WRFPLUS
3636
doc/README.hybrid_vert_coord
3737
doc/README.hydro
3838
doc/README.io_config
3939
doc/README.irr_diag
40+
doc/README.madwrf
41+
doc/README.NMM
4042
doc/README.rsl_output
41-
doc/README.windturbine
43+
doc/README.SSIB
4244
doc/README_test_cases
43-
doc/README.cygwin.md
45+
doc/README.windturbine
46+
doc/README.WRFPLUS
4447

4548
- Beginning with version 4.0, for more information on the releases, visit
4649
the WRF GitHub Release Page:

‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
### WRF-ARW Modeling System ###
22

3-
We request that all new users of WRF please register. This allows us to better determine how to support and develop the model. Please register using this form:[http://www2.mmm.ucar.edu/wrf/users/download/wrf-regist.php](http://www2.mmm.ucar.edu/wrf/users/download/wrf-regist.php).
3+
We request that all new users of WRF please register. This allows us to better determine how to support and develop the model. Please register using this form:[https://www2.mmm.ucar.edu/wrf/users/download/wrf-regist.php](https://www2.mmm.ucar.edu/wrf/users/download/wrf-regist.php).
44

5-
For an overview of the WRF modeling system, along with information regarding downloads, user support, documentation, publications, and additional resources, please see the WRF Model Users' Web Site: [http://www2.mmm.ucar.edu/wrf/users/](http://www2.mmm.ucar.edu/wrf/users/).
5+
For an overview of the WRF modeling system, along with information regarding downloads, user support, documentation, publications, and additional resources, please see the WRF Model Users' Web Site: [https://www2.mmm.ucar.edu/wrf/users/](https://www2.mmm.ucar.edu/wrf/users/).
66

7-
Information regarding WRF Model citations (including a DOI) can be found here: [http://www2.mmm.ucar.edu/wrf/users/citing_wrf.html](http://www2.mmm.ucar.edu/wrf/users/citing_wrf.html).
7+
Information regarding WRF Model citations (including a DOI) can be found here: [https://www2.mmm.ucar.edu/wrf/users/citing_wrf.html](https://www2.mmm.ucar.edu/wrf/users/citing_wrf.html).
88

9-
The WRF Model is open-source code in the public domain, and its use is unrestricted. The name "WRF", however, is a registered trademark of the University Corporation for Atmospheric Research. The WRF public domain notice and related information may be found here: [http://www2.mmm.ucar.edu/wrf/users/public.html](http://www2.mmm.ucar.edu/wrf/users/public.html).
9+
The WRF Model is open-source code in the public domain, and its use is unrestricted. The name "WRF", however, is a registered trademark of the University Corporation for Atmospheric Research. The WRF public domain notice and related information may be found here: [https://www2.mmm.ucar.edu/wrf/users/public.html](https://www2.mmm.ucar.edu/wrf/users/public.html).
1010

1111

‎Registry/Registry.EM

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,11 @@ state real tr17_6 ikjftb tracer 1 - irhusdf=(bdy_in
3434
state real tr17_7 ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr17_7" "tr17_7" "Dimensionless"
3535
state real tr17_8 ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr17_8" "tr17_8" "Dimensionless"
3636

37+
# MAD-WRF
38+
state real tr_qc ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr_qcloud" "Tracer with the liquid content" "Kg Kg-1"
39+
state real tr_qi ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr_qice" "Tracer with the ice content" "Kg Kg-1"
40+
state real tr_qs ikjftb tracer 1 - irhusdf=(bdy_interp:dt) "tr_qsnow" "Tracer with the snow content" "Kg Kg-1"
41+
3742
package tracer_test1 tracer_opt==2 - tracer:tr17_1,tr17_2,tr17_3,tr17_4,tr17_5,tr17_6,tr17_7,tr17_8
3843

3944
package restofwrf use_wps_input==0 - -

0 commit comments

Comments
 (0)