Changeset 2753a5c in flexpart.git for src/netcdf_output_mod.f90

Timestamp:

Dec 20, 2018, 2:55:22 PM (5 years ago)

Author:

Ignacio Pisso <ip@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug

Children:

7123c70

Parents:

df96ea65 (diff), 4ad96c5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

resolved merging conflicts with GFS branch

File:

• src/netcdf_output_mod.f90 (modified) (5 diffs)

src/netcdf_output_mod.f90

@@ -67 +67 @@
                        ccn_aero,in_aero, & ! wetc_in,wetd_in, &
                        reldiff,henry,f0,density,dquer,dsigma,dryvel,&
-!                       weightmolar,ohreact,spec_ass,kao,vsetaver,&
-                       weightmolar,ohcconst,ohdconst,spec_ass,kao,vsetaver,&
+                       weightmolar,ohcconst,ohdconst,vsetaver,&
                        ! for concoutput_netcdf and concoutput_nest_netcdf
                        nxmin1,nymin1,nz,oro,oron,rho,rhon,&
@@ -114 +113 @@
   logical, parameter :: write_area = .false.
 
+  ! coordinate transformation from internal to world coord
+  real :: xp1,yp1,xp2,yp2
 contains
 
@@ -512 +513 @@
         call nf90_err(nf90_put_att(ncid, sID, 'ohcconst', ohcconst(i)))
         call nf90_err(nf90_put_att(ncid, sID, 'ohdconst', ohdconst(i)))
-        call nf90_err(nf90_put_att(ncid, sID, 'kao', kao(i)))
         call nf90_err(nf90_put_att(ncid, sID, 'vsetaver', vsetaver(i)))
-        call nf90_err(nf90_put_att(ncid, sID, 'spec_ass', spec_ass(i)))
 
         if (lnest) then
@@ -535 +534 @@
         call nf90_err(nf90_put_att(ncid, sID, 'ohcconst', ohcconst(i)))
         call nf90_err(nf90_put_att(ncid, sID, 'ohdconst', ohdconst(i)))
-        call nf90_err(nf90_put_att(ncid, sID, 'kao', kao(i))) 
         call nf90_err(nf90_put_att(ncid, sID, 'vsetaver', vsetaver(i)))
-        call nf90_err(nf90_put_att(ncid, sID, 'spec_ass', spec_ass(i)))
 
         if (lnest) then
@@ -673 +670 @@
        call nf90_err(nf90_put_var(ncid, relendID, ireleaseend(i), (/i/)))
        call nf90_err(nf90_put_var(ncid, relkindzID, kindz(i), (/i/)))
-       call nf90_err(nf90_put_var(ncid, rellng1ID, xpoint1(i), (/i/)))
-       call nf90_err(nf90_put_var(ncid, rellng2ID, xpoint2(i), (/i/)))
-       call nf90_err(nf90_put_var(ncid, rellat1ID, ypoint1(i), (/i/)))
-       call nf90_err(nf90_put_var(ncid, rellat2ID, ypoint2(i), (/i/)))
+       xp1=xpoint1(i)*dx+xlon0
+       yp1=ypoint1(i)*dy+ylat0
+       xp2=xpoint2(i)*dx+xlon0
+       yp2=ypoint2(i)*dy+ylat0
+       call nf90_err(nf90_put_var(ncid, rellng1ID, xp1, (/i/)))
+       call nf90_err(nf90_put_var(ncid, rellng2ID, xp2, (/i/)))
+       call nf90_err(nf90_put_var(ncid, rellat1ID, yp1, (/i/)))
+       call nf90_err(nf90_put_var(ncid, rellat2ID, yp2, (/i/)))
        call nf90_err(nf90_put_var(ncid, relzz1ID, zpoint1(i), (/i/)))
        call nf90_err(nf90_put_var(ncid, relzz2ID, zpoint2(i), (/i/)))