[Dart-dev] DART/branches Revision: 12640

[dart at ucar.edu]

thoar at ucar.edu
2018-06-06 16:35:50 -0600 (Wed, 06 Jun 2018)
152
Removed unused routine, extraneous print statements and coerced all
real constants to have the _r8 appendix since all real variables are declared (r8)




Modified: DART/branches/openggcm/models/openggcm/openggcm_interp_mod.f90
===================================================================
--- DART/branches/openggcm/models/openggcm/openggcm_interp_mod.f90	2018-06-06 22:11:25 UTC (rev 12639)
+++ DART/branches/openggcm/models/openggcm/openggcm_interp_mod.f90	2018-06-06 22:35:50 UTC (rev 12640)
@@ -59,7 +59,7 @@
 
 real(r8), parameter :: PI  = 4.0_r8*atan(1.0_r8)
 real(r8), parameter :: RAD = PI/180.0_r8
-real(r8), parameter :: RE  = 6372.0e3
+real(r8), parameter :: RE  = 6372.0e3_r8
 
 ! Logical to keep track of if we have initialized g_oplus_int
 logical, save :: module_initialized = .false.
@@ -149,12 +149,8 @@
 enddo
 enddo
 enddo
-write(0,*)'test ',hx(1),hy(1),hz(1),hx(k),hy(k),hz(k)
 
-6000  format(3i8,3(1x,f12.5))
-
 !...... create tet4 list
-write(0,*)'max points ',k
 ntet = 0
 JTET = 0
 ITET = 0 
@@ -194,10 +190,10 @@
       itet(3,ntet)=i8
       itet(4,ntet)=i7 
       !..... tet4 centers
-      tcen_rtp(1,ntet)=0.25*(hx(i1)+hx(i4)+hx(i8)+hx(i7)) 
-      tcen_rtp(2,ntet)=0.25*(hy(i1)+hy(i4)+hy(i8)+hy(i7)) 
-      tcen_rtp(3,ntet)=0.25*(hz(i1)+hz(i4)+hz(i8)+hz(i7)) 
-      if (ip.eq.np) tcen_rtp(3,ntet) = tcen_rtp(3,ntet) + 90.0*RAD
+      tcen_rtp(1,ntet)=0.25_r8*(hx(i1)+hx(i4)+hx(i8)+hx(i7)) 
+      tcen_rtp(2,ntet)=0.25_r8*(hy(i1)+hy(i4)+hy(i8)+hy(i7)) 
+      tcen_rtp(3,ntet)=0.25_r8*(hz(i1)+hz(i4)+hz(i8)+hz(i7)) 
+      if (ip.eq.np) tcen_rtp(3,ntet) = tcen_rtp(3,ntet) + 90.0_r8*RAD
       do l=1,jtet(1,i1)
          if(jtet(l+1,i1).eq.ntet) goto 94971 
       enddo 
@@ -251,9 +247,9 @@
       a(3,1)=hz(i4)-hz(i1)
       a(3,2)=hz(i8)-hz(i1)
       a(3,3)=hz(i7)-hz(i1)
-      if (a(3,1).lt.-180.0*RAD) a(3,1)=a(3,1)+360.0*RAD
-      if (a(3,2).lt.-180.0*RAD) a(3,2)=a(3,2)+360.0*RAD
-      if (a(3,3).lt.-180.0*RAD) a(3,3)=a(3,3)+360.0*RAD
+      if (a(3,1).lt.-180.0_r8*RAD) a(3,1)=a(3,1)+360.0_r8*RAD
+      if (a(3,2).lt.-180.0_r8*RAD) a(3,2)=a(3,2)+360.0_r8*RAD
+      if (a(3,3).lt.-180.0_r8*RAD) a(3,3)=a(3,3)+360.0_r8*RAD
       !..... invert for mapping physical --> isoparameteric
       b(1,1) = a(2,2)*a(3,3) - a(3,2)*a(2,3)
       b(1,2) = a(3,2)*a(1,3) - a(1,2)*a(3,3)
@@ -281,10 +277,10 @@
       itet(2,ntet)=i5
       itet(3,ntet)=i8
       itet(4,ntet)=i7 
-      tcen_rtp(1,ntet)=0.25*(hx(i1)+hx(i5)+hx(i8)+hx(i7)) 
-      tcen_rtp(2,ntet)=0.25*(hy(i1)+hy(i5)+hy(i8)+hy(i7)) 
-      tcen_rtp(3,ntet)=0.25*(hz(i1)+hz(i5)+hz(i8)+hz(i7)) 
-      if (ip.eq.np) tcen_rtp(3,ntet) = tcen_rtp(3,ntet) + 90.0*RAD
+      tcen_rtp(1,ntet)=0.25_r8*(hx(i1)+hx(i5)+hx(i8)+hx(i7)) 
+      tcen_rtp(2,ntet)=0.25_r8*(hy(i1)+hy(i5)+hy(i8)+hy(i7)) 
+      tcen_rtp(3,ntet)=0.25_r8*(hz(i1)+hz(i5)+hz(i8)+hz(i7)) 
+      if (ip.eq.np) tcen_rtp(3,ntet) = tcen_rtp(3,ntet) + 90.0_r8*RAD
       do l=1,jtet(1,i1)
          if(jtet(l+1,i1).eq.ntet) goto 94911 
       enddo 
@@ -332,9 +328,9 @@
       a(3,1)=hz(i5)-hz(i1)
       a(3,2)=hz(i8)-hz(i1)
       a(3,3)=hz(i7)-hz(i1)
-      if (a(3,1).lt.-180.0*RAD) a(3,1)=a(3,1)+360.0*RAD
-      if (a(3,2).lt.-180.0*RAD) a(3,2)=a(3,2)+360.0*RAD
-      if (a(3,3).lt.-180.0*RAD) a(3,3)=a(3,3)+360.0*RAD
+      if (a(3,1).lt.-180.0_r8*RAD) a(3,1)=a(3,1)+360.0_r8*RAD
+      if (a(3,2).lt.-180.0_r8*RAD) a(3,2)=a(3,2)+360.0_r8*RAD
+      if (a(3,3).lt.-180.0_r8*RAD) a(3,3)=a(3,3)+360.0_r8*RAD
       b(1,1) = a(2,2)*a(3,3) - a(3,2)*a(2,3)
       b(1,2) = a(3,2)*a(1,3) - a(1,2)*a(3,3)
       b(1,3) = a(1,2)*a(2,3) - a(1,3)*a(2,2)
@@ -359,10 +355,10 @@
       itet(2,ntet)=i5
       itet(3,ntet)=i6
       itet(4,ntet)=i7 
-      tcen_rtp(1,ntet)=0.25*(hx(i1)+hx(i5)+hx(i6)+hx(i7)) 
-      tcen_rtp(2,ntet)=0.25*(hy(i1)+hy(i5)+hy(i6)+hy(i7)) 
-      tcen_rtp(3,ntet)=0.25*(hz(i1)+hz(i5)+hz(i6)+hz(i7)) 
-      if (ip.eq.np) tcen_rtp(3,ntet) = tcen_rtp(3,ntet) + 180.0*RAD
+      tcen_rtp(1,ntet)=0.25_r8*(hx(i1)+hx(i5)+hx(i6)+hx(i7)) 
+      tcen_rtp(2,ntet)=0.25_r8*(hy(i1)+hy(i5)+hy(i6)+hy(i7)) 
+      tcen_rtp(3,ntet)=0.25_r8*(hz(i1)+hz(i5)+hz(i6)+hz(i7)) 
+      if (ip.eq.np) tcen_rtp(3,ntet) = tcen_rtp(3,ntet) + 180.0_r8*RAD
       do l=1,jtet(1,i1)
       if(jtet(l+1,i1).eq.ntet) goto 94851 
       enddo 
@@ -408,9 +404,9 @@
       a(3,1)=hz(i5)-hz(i1)
       a(3,2)=hz(i6)-hz(i1)
       a(3,3)=hz(i7)-hz(i1)