forked from karpob/pycrtm
-
Notifications
You must be signed in to change notification settings - Fork 1
/
kmatrix.patch
180 lines (163 loc) · 5.56 KB
/
kmatrix.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
--- libsrc/CRTM_AerosolScatter.f90 2017-11-27 13:56:57.000000000 -0500
+++ CRTM_AerosolScatter.f90 2019-08-10 11:12:51.000000000 -0400
@@ -904,8 +904,10 @@
REAL(fp) :: f_TL(NPTS), r_TL(NPTS)
REAL(fp) :: z_TL(NPTS,NPTS)
TYPE(LPoly_type) :: wlp_TL, xlp_TL
- REAL(fp), POINTER :: z(:,:) => NULL()
-
+ !REAL(fp), POINTER :: z(:,:) => NULL()
+ REAL(fp), POINTER :: z(:,:)
+
+ nullify(z)
! Setup
! -----
! No TL output when all dimensions
@@ -1011,8 +1013,10 @@
REAL(fp) :: f_AD(NPTS), r_AD(NPTS)
REAL(fp) :: z_AD(NPTS,NPTS)
TYPE(LPoly_type) :: wlp_AD, xlp_AD
- REAL(fp), POINTER :: z(:,:) => NULL()
+ !REAL(fp), POINTER :: z(:,:) => NULL()
+ REAL(fp), POINTER :: z(:,:)
+ nullify(z)
! Setup
! -----
--- libsrc/CRTM_CloudScatter.f90 2017-11-27 13:56:51.000000000 -0500
+++ CRTM_CloudScatter.f90 2019-08-10 11:12:50.000000000 -0400
@@ -931,7 +931,9 @@
REAL(fp) :: f_TL(NPTS), r_TL(NPTS)
REAL(fp) :: z_TL(NPTS,NPTS)
TYPE(LPoly_type) :: wlp_TL, xlp_TL
- REAL(fp), POINTER :: z(:,:) => NULL()
+ !REAL(fp), POINTER :: z(:,:) => NULL()
+ REAL(fp), POINTER :: z(:,:)
+ nullify(z)
! Setup
@@ -1042,8 +1044,9 @@
REAL(fp) :: f_AD(NPTS), r_AD(NPTS)
REAL(fp) :: z_AD(NPTS,NPTS)
TYPE(LPoly_type) :: wlp_AD, xlp_AD
- REAL(fp), POINTER :: z(:,:) => NULL()
-
+ !REAL(fp), POINTER :: z(:,:) => NULL()
+ REAL(fp), POINTER :: z(:,:)
+ nullify(z)
! Setup
! -----
@@ -1294,10 +1297,12 @@
REAL(fp) :: z2_TL(NPTS,NPTS)
REAL(fp) :: z3_TL(NPTS,NPTS,NPTS)
TYPE(LPoly_type) :: wlp_TL, xlp_TL, ylp_TL
- REAL(fp), POINTER :: z2(:,:) => NULL()
- REAL(fp), POINTER :: z3(:,:,:) => NULL()
-
-
+ !REAL(fp), POINTER :: z2(:,:) => NULL()
+ !REAL(fp), POINTER :: z3(:,:,:) => NULL()
+ REAL(fp), POINTER :: z2(:,:)
+ REAL(fp), POINTER :: z3(:,:,:)
+ nullify(z2)
+ nullify(z3)
! Setup
! -----
! Initialise results that may
@@ -1481,9 +1486,14 @@
REAL(fp) :: z2_AD(NPTS,NPTS)
REAL(fp) :: z3_AD(NPTS,NPTS,NPTS)
TYPE(LPoly_type) :: wlp_AD, xlp_AD, ylp_AD
- REAL(fp), POINTER :: z2(:,:) => NULL()
- REAL(fp), POINTER :: z3(:,:,:) => NULL()
+ !REAL(fp), POINTER :: z2(:,:) => NULL()
+ !REAL(fp), POINTER :: z3(:,:,:) => NULL()
+
+ REAL(fp), POINTER :: z2(:,:)
+ REAL(fp), POINTER :: z3(:,:,:)
+ nullify(z2)
+ nullify(z3)
! Setup
! -----
! Initialise local adjoint variables
--- libsrc/ODPS_Predictor.f90 2017-11-27 13:56:47.000000000 -0500
+++ ODPS_Predictor.f90 2019-08-10 11:12:50.000000000 -0400
@@ -522,7 +522,6 @@
! Local variables
REAL(fp) :: Absorber_AD(Predictor%n_Layers, TC%n_Absorbers)
REAL(fp) :: Temperature_AD(Predictor%n_Layers)
-
! Initialise local adjoint variables
Temperature_AD = ZERO
Absorber_AD = ZERO
@@ -556,7 +555,6 @@
Temperature_AD , &
Absorber_AD )
-
! Map data from user to internal fixed pressure layers/levels
CALL Map_Input_AD( &
TC , &
@@ -564,7 +562,6 @@
Absorber_AD , &
Atm_AD , &
Predictor%PAFV )
-
END SUBROUTINE ODPS_Assemble_Predictors_AD
@@ -1207,8 +1204,8 @@
REAL(fp) :: GAzp_TL(SIZE(Absorber, DIM=1), SIZE(Absorber, DIM=2))
REAL(fp) :: GATzp_sum_TL(SIZE(Absorber, DIM=2))
REAL(fp) :: GATzp_TL(SIZE(Absorber, DIM=1), SIZE(Absorber, DIM=2))
- TYPE(PAFV_type), POINTER :: PAFV => NULL()
-
+ TYPE(PAFV_type), POINTER :: PAFV !=> NULL()
+ nullify(PAFV)
! use short name
PAFV => Predictor%PAFV
@@ -1772,8 +1769,9 @@
REAL(fp) :: GAzp_AD(SIZE(Absorber, DIM=1), SIZE(Absorber, DIM=2))
REAL(fp) :: GATzp_sum_AD(SIZE(Absorber, DIM=2))
REAL(fp) :: GATzp_AD(SIZE(Absorber, DIM=1), SIZE(Absorber, DIM=2))
- TYPE(PAFV_type), POINTER :: PAFV => NULL()
+ TYPE(PAFV_type), POINTER :: PAFV !=> NULL()
+ nullify(PAFV)
! use short name
PAFV => Predictor%PAFV
@@ -2875,8 +2873,8 @@
t2_TL, s_t_TL, s_p_TL, Inverse_TL, d_Absorber_TL
REAL(fp) :: Int_vapor_prev_TL, Int_vapor_TL, AveA_TL, ap1_TL
INTEGER :: i, k
- TYPE(PAFV_type), POINTER :: PAFV => NULL()
-
+ TYPE(PAFV_type), POINTER :: PAFV !=> NULL()
+ nullify(PAFV)
! short name
PAFV => Predictor%PAFV
@@ -3060,8 +3058,9 @@
REAL(fp) :: t2_AD, s_t_AD, s_p_AD, Inverse_AD, d_Absorber_AD
REAL(fp) :: Int_vapor_prev_AD, Int_vapor_AD, AveA_AD, ap1_AD
INTEGER :: i, k
- TYPE(PAFV_type), POINTER :: PAFV => NULL()
+ TYPE(PAFV_type), POINTER :: PAFV !=> NULL()
+ nullify(PAFV)
! short name
PAFV => Predictor%PAFV
--- libsrc/NESDIS_ATMS_SnowEM_Module.f90 2017-11-27 13:56:50.000000000 -0500
+++ NESDIS_ATMS_SnowEM_Module.f90 2019-08-10 11:32:30.000000000 -0400
@@ -291,13 +291,16 @@
REAL(fp),INTENT(IN), OPTIONAL :: Tbs(:), Tss, Snow_Depth
REAL(fp),INTENT(OUT) :: Emissivity_H,Emissivity_V
REAL(fp) :: em_vector(2),esh1,esv1,esh2,esv2,desh,desv,dem
- REAL(fp) :: Ts = 273.15 ! default skin-surface temperature
- INTEGER :: Snow_Type = 4 ! default snow type
+ REAL(fp) :: Ts
+ INTEGER :: Snow_Type
INTEGER :: i
- LOGICAL :: VALID_SNOW_DEPTH = .FALSE.
- INTEGER :: input_type = 0
-
+ LOGICAL :: VALID_SNOW_DEPTH
+ INTEGER :: input_type
+ Ts = 273.15
+ Snow_Type = 4
+ VALID_SNOW_DEPTH = .FALSE.
+ input_type = 0
! Analyze the input types and determine which algorithms to be used
IF (PRESENT(Snow_Depth) .AND. PRESENT(Tss) ) THEN