Changeset 171 for trunk/LMDZ.MARS/libf

Timestamp:

Jun 22, 2011, 7:51:16 AM (13 years ago)

Author:

emillour

Message:

Mars GCM:

• added modifications (from JYC & FGG) to tracer.h & initracer.F for ions
• minor improvement to newstart.F (q=x option, check that tracer index provided by user is valid).

EM

Location:

trunk/LMDZ.MARS/libf

Files:

• dyn3d/newstart.F (modified) (2 diffs)
• phymars/initracer.F (modified) (3 diffs)
• phymars/tracer.h (modified) (2 diffs)

trunk/LMDZ.MARS/libf/dyn3d/newstart.F

@@ -734 +734 @@
              write(*,*) '(choose between 1 and ',nqmx,')'
              read(*,*) iq 
+             if ((iq.lt.1).or.(iq.gt.nqmx)) then
+               ! wrong value for iq, go back to menu
+               write(*,*) "wrong input value:",iq
+               cycle
+             endif
              write(*,*)'mixing ratio of tracer ',trim(tnom(iq)),
      &                 ' ? (kg/kg)'
@@ -1416 +1421 @@
      *rage est differente de la valeur parametree llm =',i4//)
 
+      write(*,*) "newstart: All is well that ends well."
+
       end
 

trunk/LMDZ.MARS/libf/phymars/initracer.F

@@ -231 +231 @@
       igcm_ar=0
       igcm_ar_n2=0
+      igcm_n=0
+      igcm_no=0
+      igcm_no2=0
+      igcm_n2d=0
+      igcm_co2plus=0
+      igcm_oplus=0
+      igcm_o2plus=0
+      igcm_coplus=0
+      igcm_cplus=0
+      igcm_nplus=0
+      igcm_noplus=0
+      igcm_n2plus=0
+      igcm_hplus=0
+      igcm_elec=0
+
 
       ! 1. find dust tracers
@@ -333 +348 @@
           count=count+1
         endif
+        if (noms(iq).eq."n") then
+          igcm_n=iq
+          mmol(igcm_n)=14.
+          count=count+1
+        endif
+        if (noms(iq).eq."no") then
+          igcm_no=iq
+          mmol(igcm_no)=30.
+          count=count+1
+        endif
+        if (noms(iq).eq."no2") then
+          igcm_no2=iq
+          mmol(igcm_no2)=46.
+          count=count+1
+        endif
+        if (noms(iq).eq."n2d") then
+          igcm_n2d=iq
+          mmol(igcm_n2d)=28.
+          count=count+1
+        endif
+        if (noms(iq).eq."co2plus") then
+          igcm_co2plus=iq
+          mmol(igcm_co2plus)=44.
+          count=count+1
+        endif
+        if (noms(iq).eq."oplus") then
+          igcm_oplus=iq
+          mmol(igcm_oplus)=16.
+          count=count+1
+        endif
+        if (noms(iq).eq."o2plus") then
+          igcm_o2plus=iq
+          mmol(igcm_o2plus)=32.
+          count=count+1
+        endif
+        if (noms(iq).eq."coplus") then
+          igcm_coplus=iq
+          mmol(igcm_coplus)=28.
+          count=count+1
+        endif
+        if (noms(iq).eq."cplus") then
+          igcm_cplus=iq
+          mmol(igcm_cplus)=12.
+          count=count+1
+        endif
+        if (noms(iq).eq."nplus") then
+          igcm_nplus=iq
+          mmol(igcm_nplus)=14.
+          count=count+1
+        endif
+        if (noms(iq).eq."noplus") then
+          igcm_noplus=iq
+          mmol(igcm_noplus)=30.
+          count=count+1
+        endif
+        if (noms(iq).eq."n2plus") then
+          igcm_n2plus=iq
+          mmol(igcm_n2plus)=28.
+          count=count+1
+        endif
+        if (noms(iq).eq."hplus") then
+          igcm_hplus=iq
+          mmol(igcm_hplus)=1.
+          count=count+1
+        endif
+        if (noms(iq).eq."elec") then
+          igcm_elec=iq
+          mmol(igcm_elec)=1./1822.89
+          count=count+1
+        endif
         if (noms(iq).eq."h2o_vap") then
           igcm_h2o_vap=iq
@@ -349 +434 @@
           count=count+1
         endif
+        
+
+
       enddo ! of do iq=1,nqmx
 !      count=count+nbqchem

trunk/LMDZ.MARS/libf/phymars/tracer.h

@@ -46 +46 @@
       integer :: igcm_n2
       integer :: igcm_ar
-      
+      integer :: igcm_n
+      integer :: igcm_no
+      integer :: igcm_no2
+      integer :: igcm_n2d
+      ! Ions
+      integer :: igcm_co2plus
+      integer :: igcm_oplus
+      integer :: igcm_o2plus
+      integer :: igcm_coplus
+      integer :: igcm_cplus
+      integer :: igcm_nplus
+      integer :: igcm_noplus
+      integer :: igcm_n2plus 
+      integer :: igcm_hplus
+      integer :: igcm_elec
       ! other tracers
       integer :: igcm_ar_n2 ! for simulations using co2 +neutral gas
@@ -59 +73 @@
      & igcm_h2o_vap,igcm_h2o_ice,igcm_co2,igcm_co,igcm_o,igcm_o1d,      &
      & igcm_o2,igcm_o3,igcm_h,igcm_h2,igcm_oh,igcm_ho2,igcm_h2o2,       &
-     & igcm_n2,igcm_ar,igcm_ar_n2!,nbqchem,niqchem
+     & igcm_n2,igcm_ar,igcm_n,igcm_no,igcm_no2,igcm_n2d,                &
+     & igcm_co2plus,igcm_oplus,igcm_o2plus,igcm_coplus,igcm_cplus,      &
+     & igcm_nplus,igcm_noplus,igcm_n2plus,igcm_hplus,igcm_elec,         &
+     & igcm_ar_n2!,nbqchem,niqchem
       COMMON/tracer3/noms
 !-----------------------------------------------------------------------