Skip to content

Commit a28f96d

Browse files
mpaiaompaiao
authored
Merge pull request #413 from mpaiao/mpaiao-pr-imetavg
Migrate time stamp control from namelist to the meteorological driver header
2 parents ba01d4a + 7aee006 commit a28f96d

File tree

19 files changed

+80
-216
lines changed

19 files changed

+80
-216
lines changed

‎BRAMS/src/ed2/edcp_load_namelist.f90‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ subroutine read_ednl(iunit,filename)
3232
, imettype & ! intent(out)
3333
, metcyc1 & ! intent(out)
3434
, metcycf & ! intent(out)
35-
, imetavg & ! intent(out)
3635
, imetrad & ! intent(out)
3736
, lapse_scheme ! ! intent(out)
3837
use mem_polygons , only : n_poi & ! intent(out)
@@ -445,7 +444,6 @@ subroutine read_ednl(iunit,filename)
445444
imettype = 1 ! BRAMS is the meteorology driver...
446445
metcyc1 = 0000 ! BRAMS is the meteorology driver...
447446
metcycf = 0000 ! BRAMS is the meteorology driver...
448-
imetavg = 0 ! BRAMS is the meteorology driver...
449447
ioptinpt = '' ! It will be used once optimization is
450448
! implemented in ED-2.1.
451449
unitfast = 0 ! Since BRAMS uses frqanl and frqhist in seconds, there is no

‎ED/Template/Template/ED2IN‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,21 +1755,6 @@ $ED_NL
17551755
! IMETCYCF -- Last year for which meteorological driver files exist. In addition, !
17561756
! the model assumes that files exist for all years between METCYC1 and !
17571757
! METCYCF. !
1758-
! IMETAVG -- How the input radiation was originally averaged. You must tell this !
1759-
! because ED-2.1 can make a interpolation accounting for the cosine of !
1760-
! zenith angle. !
1761-
! -1. (Deprecated) I don't know, use linear interpolation. !
1762-
! 0. No average, the values are instantaneous !
1763-
! 1. Averages ending at the reference time !
1764-
! 2. Averages beginning at the reference time !
1765-
! 3. Averages centred at the reference time !
1766-
! !
1767-
! IMPORTANT: The user must obtain the correct information for each !
1768-
! meteorological driver before running the model, and set !
1769-
! this variable consistently. Inconsistent settings are !
1770-
! known to cause numerical instabilities, particularly at !
1771-
! around sunrise and sunset times. !
1772-
! !
17731758
! IMETRAD -- What should the model do with the input short wave radiation? !
17741759
! 0. (ED-2.2 default, when radiation components were measured) !
17751760
! Nothing, use it as is. !
@@ -1795,7 +1780,6 @@ $ED_NL
17951780
NL%ISHUFFLE = 0
17961781
NL%METCYC1 = mymetcyc1
17971782
NL%METCYCF = mymetcycf
1798-
NL%IMETAVG = mymetavg
17991783
NL%IMETRAD = mymetrad
18001784
NL%INITIAL_CO2 = myatmco2
18011785
!---------------------------------------------------------------------------------------!

‎ED/Template/scripts/SLURM/spawn_poly.sh‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1504,205 +1504,171 @@ do
15041504
metdriverdb="${fullscen}/Bananal/Bananal_HEADER"
15051505
metcyc1=2004
15061506
metcycf=2006
1507-
imetavg=1
15081507
;;
15091508
Brasilia)
15101509
metdriverdb="${fullscen}/Brasilia/Brasilia_HEADER"
15111510
metcyc1=2006
15121511
metcycf=2012
1513-
imetavg=1
15141512
;;
15151513
Caxiuana)
15161514
metdriverdb="${fullscen}/Caxiuana/Caxiuana_HEADER"
15171515
metcyc1=1999
15181516
metcycf=2003
1519-
imetavg=1
15201517
;;
15211518
ERA5_CHIRPS)
15221519
metdriverdb="${fullscen}/${iscenario}_HEADER"
15231520
metcyc1=1981
15241521
metcycf=2019
1525-
imetavg=1
15261522
;;
15271523
ERAINT_CHIRPS)
15281524
metdriverdb="${fullscen}/${iscenario}_HEADER"
15291525
metcyc1=1981
15301526
metcycf=2017
1531-
imetavg=2
15321527
;;
15331528
ERAINT_NATIVE)
15341529
metdriverdb="${fullscen}/${iscenario}_HEADER"
15351530
metcyc1=1979
15361531
metcycf=2017
1537-
imetavg=2
15381532
;;
15391533
ERAINT_MSWEP2)
15401534
metdriverdb="${fullscen}/${iscenario}_HEADER"
15411535
metcyc1=1979
15421536
metcycf=2016
1543-
imetavg=2
15441537
;;
15451538
Fazenda_Nossa_Senhora)
15461539
metdriverdb="${fullscen}/Fazenda_Nossa_Senhora/Fazenda_Nossa_Senhora_HEADER"
15471540
metcyc1=1999
15481541
metcycf=2002
1549-
imetavg=1
15501542
;;
15511543
Harvard)
15521544
metdriverdb="${fullscen}/Harvard/Harvard_HEADER"
15531545
metcyc1=1992
15541546
metcycf=2003
1555-
imetavg=3
15561547
;;
15571548
Laegern)
15581549
metdriverdb="${fullscen}/Laegern/Laegern_HEADER"
15591550
metcyc1=2006
15601551
metcycf=2016
1561-
imetavg=1
15621552
;;
15631553
Manaus_Km34)
15641554
metdriverdb="${fullscen}/Manaus_Km34/Manaus_Km34_HEADER"
15651555
metcyc1=1999
15661556
metcycf=2006
1567-
imetavg=1
15681557
;;
15691558
MERRA2_CHIRPS)
15701559
metdriverdb="${fullscen}/${iscenario}_HEADER"
15711560
metcyc1=1981
15721561
metcycf=2017
1573-
imetavg=3
15741562
;;
15751563
MERRA2_MSWEP2)
15761564
metdriverdb="${fullscen}/${iscenario}_HEADER"
15771565
metcyc1=1980
15781566
metcycf=2016
1579-
imetavg=3
15801567
;;
15811568
MERRA2_NATIVE)
15821569
metdriverdb="${fullscen}/${iscenario}_HEADER"
15831570
metcyc1=1980
15841571
metcycf=2017
1585-
imetavg=3
15861572
;;
15871573
Natal)
15881574
metdriverdb="${fullscen}/Natal/Natal_HEADER"
15891575
metcyc1=2009
15901576
metcycf=2012
1591-
imetavg=1
15921577
;;
15931578
Paracou)
15941579
metdriverdb="${fullscen}/Paracou/Paracou_HEADER"
15951580
metcyc1=2004
15961581
metcycf=2014
1597-
imetavg=1
15981582
;;
15991583
Pe-de-Gigante)
16001584
metdriverdb="${fullscen}/Pe-de-Gigante/Pe-de-Gigante_HEADER"
16011585
metcyc1=2001
16021586
metcycf=2003
1603-
imetavg=1
16041587
;;
16051588
Petrolina)
16061589
metdriverdb="${fullscen}/Petrolina/Petrolina_HEADER"
16071590
metcyc1=2004
16081591
metcycf=2012
1609-
imetavg=1
16101592
;;
16111593
PGMF3_CHIRPS)
16121594
metdriverdb="${fullscen}/${iscenario}_HEADER"
16131595
metcyc1=1981
16141596
metcycf=2016
1615-
imetavg=3
16161597
;;
16171598
PGMF3_MSWEP2)
16181599
metdriverdb="${fullscen}/${iscenario}_HEADER"
16191600
metcyc1=1979
16201601
metcycf=2016
1621-
imetavg=3
16221602
;;
16231603
PGMF3_NATIVE)
16241604
metdriverdb="${fullscen}/${iscenario}_HEADER"
16251605
metcyc1=1979
16261606
metcycf=2016
1627-
imetavg=3
16281607
;;
16291608
Rebio_Jaru)
16301609
metdriverdb="${fullscen}/Rebio_Jaru/Rebio_Jaru_HEADER"
16311610
metcyc1=1999
16321611
metcycf=2002
1633-
imetavg=1
16341612
;;
16351613
Santarem_Km67)
16361614
metdriverdb="${fullscen}/Santarem_Km67/Santarem_Km67_HEADER"
16371615
metcyc1=2001
16381616
metcycf=2011
1639-
imetavg=1
16401617
;;
16411618
Santarem_Km77)
16421619
metdriverdb="${fullscen}/Santarem_Km77/Santarem_Km77_HEADER"
16431620
metcyc1=2001
16441621
metcycf=2005
1645-
imetavg=1
16461622
;;
16471623
Santarem_Km83)
16481624
metdriverdb="${fullscen}/Santarem_Km83/Santarem_Km83_HEADER"
16491625
metcyc1=2000
16501626
metcycf=2003
1651-
imetavg=1
16521627
;;
16531628
Sheffield)
16541629
metdriverdb=${fullscen}/${shefhead}
16551630
metcyc1=1969
16561631
metcycf=2008
1657-
imetavg=2
16581632
;;
16591633
Tanguro_Burn)
16601634
metdriverdb="${fullscen}/Tanguro_Burn/Tanguro_Burn_HEADER"
16611635
metcyc1=2008
16621636
metcycf=2018
1663-
imetavg=1
16641637
;;
16651638
Tanguro_Ctrl)
16661639
metdriverdb="${fullscen}/Tanguro_Ctrl/Tanguro_Ctrl_HEADER"
16671640
metcyc1=2008
16681641
metcycf=2018
1669-
imetavg=1
16701642
;;
16711643
Tonzi)
16721644
metdriverdb="${fullscen}/Tonzi/Tonzi_HEADER"
16731645
metcyc1=2000
16741646
metcycf=2010
1675-
imetavg=1
16761647
;;
16771648
WFDE5_CHIRPS)
16781649
metdriverdb="${fullscen}/${iscenario}_HEADER"
16791650
metcyc1=1981
16801651
metcycf=2018
1681-
imetavg=2
16821652
;;
16831653
WFDEI_CHIRPS)
16841654
metdriverdb="${fullscen}/${iscenario}_HEADER"
16851655
metcyc1=1981
16861656
metcycf=2016
1687-
imetavg=1
16881657
;;
16891658
WFDEI_CRUP)
16901659
metdriverdb="${fullscen}/${iscenario}_HEADER"
16911660
metcyc1=1979
16921661
metcycf=2016
1693-
imetavg=1
16941662
;;
16951663
WFDEI_GPCC)
16961664
metdriverdb="${fullscen}/${iscenario}_HEADER"
16971665
metcyc1=1979
16981666
metcycf=2016
1699-
imetavg=1
17001667
;;
17011668
WFDEI_MSWEP2)
17021669
metdriverdb="${fullscen}/${iscenario}_HEADER"
17031670
metcyc1=1979
17041671
metcycf=2016
1705-
imetavg=1
17061672
;;
17071673
*)
17081674
echo "Met driver: ${metdriver}"

‎ED/run/ED2IN‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1737,20 +1737,6 @@ $ED_NL
17371737
! IMETCYCF -- Last year for which meteorological driver files exist. In addition, !
17381738
! the model assumes that files exist for all years between METCYC1 and !
17391739
! METCYCF. !
1740-
! IMETAVG -- How the input radiation was originally averaged. You must tell this !
1741-
! because ED-2.1 can make a interpolation accounting for the cosine of !
1742-
! zenith angle. !
1743-
! -1. (Deprecated) I don't know, use linear interpolation. !
1744-
! 0. No average, the values are instantaneous !
1745-
! 1. Averages ending at the reference time !
1746-
! 2. Averages beginning at the reference time !
1747-
! 3. Averages centred at the reference time !
1748-
! !
1749-
! IMPORTANT: The user must obtain the correct information for each !
1750-
! meteorological driver before running the model, and set !
1751-
! this variable consistently. Inconsistent settings are !
1752-
! known to cause numerical instabilities, particularly at !
1753-
! around sunrise and sunset times. !
17541740
! !
17551741
! IMETRAD -- What should the model do with the input short wave radiation? !
17561742
! 0. (ED-2.2 default, when radiation components were measured) !
@@ -1777,7 +1763,6 @@ $ED_NL
17771763
NL%ISHUFFLE = 0
17781764
NL%METCYC1 = 2004
17791765
NL%METCYCF = 2014
1780-
NL%IMETAVG = 1
17811766
NL%IMETRAD = 5
17821767
NL%INITIAL_CO2 = 410.
17831768
!---------------------------------------------------------------------------------------!

‎ED/run/ED_MET_DRIVER_HEADER‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
1
33
/home/rknox/Datasets/CCSM3/H5/ccsm3_surf_SA_
44
51 51 1.5 1.5 -100.75 -60.0
5+
1
56
15
67
'lat' 'lon' 'vbdsf' 'vddsf' 'prate' 'dlwrf' 'pres' 'ugrd' 'vgrd' 'sh' 'tmp' 'hgt' 'co2' 'nbdsf' 'nddsf'
78
00.00 00.00 21600.0 21600.0 21600.0 21600.0 21600.0 21600.0 21600.0 21600.0 21600.0 50.0 21600.0 21600.0 21600.0

0 commit comments

Comments
 (0)