Changeset 1380 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Feb 25, 2015, 5:11:26 PM (10 years ago)

Author:

emillour

Message:

Mars model:
Very minor additions for the 1D model:

• avoid defining 0 traceurs in startfi file, as that value is resrved in NetCDF for unlimited dimensions,
• add a check on the presence of co2,co,o and n2 tracers when using nltemodel>0

EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• initracer.F (modified) (1 diff)
• iostart.F90 (modified) (1 diff)
• physiq.F (modified) (1 diff)
• testphys1d.F (modified) (3 diffs)

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

@@ -589 +589 @@
        endif
 
+       if (callnlte) then ! NLTE requirements
+         if (nltemodel.ge.1) then
+           ! check that co2, co, o and n2 tracers are available
+           if (igcm_co2.eq.0) then
+             write(*,*) "initracer: error !!"
+             write(*,*) "  with nltemodel>0, we need the co2 tracer!"
+             stop
+           endif
+           if (igcm_co.eq.0) then
+             write(*,*) "initracer: error !!"
+             write(*,*) "  with nltemodel>0, we need the co tracer!"
+             stop
+           endif
+           if (igcm_o.eq.0) then
+             write(*,*) "initracer: error !!"
+             write(*,*) "  with nltemodel>0, we need the o tracer!"
+             stop
+           endif
+           if (igcm_n2.eq.0) then
+             write(*,*) "initracer: error !!"
+             write(*,*) "  with nltemodel>0, we need the n2 tracer!"
+             stop
+           endif
+         endif 
+       endif
+
        if (scavenging) then
        ! verify that we indeed have ccn_mass and ccn_number tracers

trunk/LMDZ.MARS/libf/phymars/iostart.F90

@@ -528 +528 @@
       ENDIF
       
-      ierr=NF90_DEF_DIM(nid_restart,"number_of_advected_fields",nqtot,idim5)
+      if (nqtot.ne.0) then
+        ierr=NF90_DEF_DIM(nid_restart,"number_of_advected_fields",nqtot,idim5)
+      else
+        ! pretend nqtot=1 because 0 size implies unlimited dimension for NetCDF
+        ierr=NF90_DEF_DIM(nid_restart,"number_of_advected_fields",1,idim5)
+      endif
       IF (ierr/=NF90_NOERR) THEN
         write(*,*)'open_restartphy: problem defining number_of_advected_fields dimension '

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

@@ -2454 +2454 @@
          call WRITEDIAGFI(ngrid,"pplev","Pressure","Pa",1,zplev)
          call WRITEDIAGFI(ngrid,"rho","rho","kg.m-3",1,rho)
-!         call WRITEDIAGFI(ngrid,"dtrad","rad. heat. rate",              &
-!     &              "K.s-1",1,dtrad/zpopsk)
-!        call WRITEDIAGFI(ngrid,'sw_htrt','sw heat. rate',
-!     &                   'w.m-2',1,zdtsw/zpopsk)
-!        call WRITEDIAGFI(ngrid,'lw_htrt','lw heat. rate',
-!     &                   'w.m-2',1,zdtlw/zpopsk)
+         call WRITEDIAGFI(ngrid,"dtrad","rad. heat. rate",              &
+     &              "K.s-1",1,dtrad)
+        call WRITEDIAGFI(ngrid,'sw_htrt','sw heat. rate',
+     &                   'w.m-2',1,zdtsw)
+        call WRITEDIAGFI(ngrid,'lw_htrt','lw heat. rate',
+     &                   'w.m-2',1,zdtlw)
          call WRITEDIAGFI(ngrid,"co2ice","co2 ice thickness"
      &                                   ,"kg.m-2",0,co2ice)

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

@@ -373 +373 @@
       ! we still need to set (dummy) tracer number and names for physdem1
         nq=1
+        nqtot=nq ! set value of nqtot (in infotrac module) as nq
         ! allocate arrays:
         allocate(tname(nq))
@@ -381 +382 @@
         allocate(mqtot(nq))
         do iq=1,nq
-          write(str7,'(a1,i2.2)')'q',iq
+          write(str7,'(a1,i2.2)')'t',iq
           tname(iq)=str7
         enddo
@@ -797 +798 @@
         CALL endg1d(1,nlayer,zlay/1000.,ndt)
 
-c    ========================================================
+      write(*,*) "testphys1d: Everything is cool."
+
       END