Changeset 1106

Timestamp:

Nov 18, 2013, 11:43:48 AM (11 years ago)

Author:

tnavarro

Message:

option freedust with ice microphysics & masse naming in start files

Location:

trunk/LMDZ.MARS/libf

Files:

• dyn3d/dynredem.F (modified) (1 diff)
• dyn3d/newstart.F (modified) (2 diffs)
• phymars/inifis.F (modified) (1 diff)

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

@@ -933 +933 @@
       ierr = NF_DEF_VAR (nid,"masse",NF_FLOAT,4,dims4,nvarid)
 #endif
-      ierr = NF_PUT_ATT_TEXT (nid, nvarid, "title", 12,
-     .                       "C est quoi ?")
+      ierr = NF_PUT_ATT_TEXT (nid, nvarid, "title", 19,
+     .                       "Masse atmospherique")
 c
       dims3(1) = idim_rlonv

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

@@ -19 +19 @@
       use infotrac, only: iniadvtrac, nqtot, tnom
       use tracer_mod, only: noms, igcm_dust_number, igcm_dust_mass,
+     &                      igcm_ccn_number, igcm_ccn_mass,
      &                      igcm_h2o_vap, igcm_h2o_ice
       use surfdat_h, only: phisfi, z0, zmea, zstd, zsig, zgam, zthe,
@@ -850 +851 @@
             do j=1,jjp1
               do i=1,iip1
-                q(i,j,l,igcm_dust_number)=
+                if (igcm_dust_number .ne. 0) 
+     &          q(i,j,l,igcm_dust_number)=
      &                q(i,j,l,igcm_dust_number) * 1e-3 ! grosso modo
-                q(i,j,l,igcm_dust_mass)=
+                if (igcm_dust_mass .ne. 0) 
+     &          q(i,j,l,igcm_dust_mass)=
      &                q(i,j,l,igcm_dust_mass)   * 1e-3 ! grosso modo
+                if (igcm_ccn_number .ne. 0) 
+     &          q(i,j,l,igcm_ccn_number)=
+     &                q(i,j,l,igcm_ccn_number) * 1e-3 ! grosso modo
+                if (igcm_ccn_mass .ne. 0) 
+     &          q(i,j,l,igcm_ccn_mass)=
+     &                q(i,j,l,igcm_ccn_mass)   * 1e-3 ! grosso modo
               end do
             end do

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

@@ -511 +511 @@
          call getin("microphys",microphys)
          write(*,*)" microphys = ",microphys
-         if (freedust.and.microphys) then
-           print*,'freedust can not be used with microphys !'
-           print*,'(although that could be improved...)'
-           stop
-         endif
 
 ! microphysical parameter contact