Merge pull request #712 from XiaqiongZhou-NOAA/udhmhj

To add multi_gases and molecular diffusion options
NCAR · Oct 26, 2021 · 4da4950 · 4da4950
2 parents 7d7b3bc + f063b4e
commit 4da4950
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/physics/gfs_phy_tracer_config.F b/physics/gfs_phy_tracer_config.F
@@ -1,4 +1,3 @@
-#undef MULTI_GASES
 
 !
 !! ! Module: gfs_phy_tracer_config
@@ -123,7 +122,6 @@ subroutine tracer_config_init (ntrac,ntoz,ntcw,ncld,
 
 !--- fill in met tracers
                       gfs_phy_tracer%vname(1)     = 'spfh'   
-        if(ntoz  > 0) gfs_phy_tracer%vname(ntoz)  = 'o3mr'   
         if(ntcw  > 0) gfs_phy_tracer%vname(ntcw)  = 'clwmr'   
         if(ntiw  > 0) gfs_phy_tracer%vname(ntiw)  = 'climr'   
         if(ntlnc > 0) gfs_phy_tracer%vname(ntlnc) = 'lnc'
@@ -134,10 +132,12 @@ subroutine tracer_config_init (ntrac,ntoz,ntcw,ncld,
         if(ntsnc > 0) gfs_phy_tracer%vname(ntsnc) = 'snc'
         if(ntke  > 0) gfs_phy_tracer%vname(ntke)  = 'tke'   
 #ifdef MULTI_GASES
-        print *,' ++++ nto nto2 ',nto,nto2
-        if(nto   > 0) gfs_phy_tracer%vname(nto)   = 'spfo'
-        if(nto2  > 0) gfs_phy_tracer%vname(nto2)  = 'spfo2'
+        print *,' ++++ ntoz nto nto2 ',ntoz,nto,nto2
+        if(ntoz  > 0) gfs_phy_tracer%vname(ntoz)  = 'spo3'   
+        if(nto   > 0) gfs_phy_tracer%vname(nto)   = 'spo'
+        if(nto2  > 0) gfs_phy_tracer%vname(nto2)  = 'spo2'
 #else
+        if(ntoz  > 0) gfs_phy_tracer%vname(ntoz)  = 'o3mr'   
         if(nto   > 0) gfs_phy_tracer%vname(nto)   = 'o'   
         if(nto2  > 0) gfs_phy_tracer%vname(nto2)  = 'o2'   
 #endif