Changeset 1415 for trunk/LMDZ.GENERIC

Timestamp:

Apr 14, 2015, 9:46:47 AM (10 years ago)

Author:

milmd

Message:

Update newstart and start2archive programs of LMDZ.GENERIC and LMDZ.MARS to the new organization.

Location:

trunk/LMDZ.GENERIC/libf

Files:

• dynlonlat_phylonlat/phystd/newstart.F (modified) (5 diffs)
• dynlonlat_phylonlat/phystd/start2archive.F (modified) (4 diffs)
• phystd/phyetat0.F90 (modified) (1 diff)

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

@@ -15 +15 @@
 c=======================================================================
 
-      use infotrac, only: iniadvtrac, nqtot, tname
+      use infotrac, only: infotrac_init, nqtot, tname
       USE tracer_h, ONLY: igcm_co2_ice, igcm_h2o_vap, igcm_h2o_ice
       USE comsoil_h, ONLY: nsoilmx, layer, mlayer, inertiedat
@@ -25 +25 @@
 !      USE ioipsl_getincom, only: getin
       USE ioipsl_getincom_p, only: getin_p
-      use control_mod, only: day_step, iphysiq, anneeref
+      use control_mod, only: day_step, iphysiq, anneeref, planet_type
       use phyredem, only: physdem0, physdem1
       use iostart, only: open_startphy
@@ -198 +198 @@
       call initcomgeomphy
 ! Load tracer number and names:
-      call iniadvtrac(nqtot,numvanle)
+!      call iniadvtrac(nqtot,numvanle)
+      call infotrac_init
 ! allocate arrays
       allocate(q(iip1,jjp1,llm,nqtot))
       allocate(qsurf(ngridmx,nqtot))
+      
+      planet_type="generic"
 
 c=======================================================================
@@ -1637 +1640 @@
 
           
-      CALL dynredem0("restart.nc",day_ini,anneeref,phis,nqtot)
-      CALL dynredem1("restart.nc",0.0,vcov,ucov,teta,q,nqtot,masse,ps) 
+      CALL dynredem0("restart.nc",day_ini,phis)
+      CALL dynredem1("restart.nc",0.0,vcov,ucov,teta,q,masse,ps) 
 C
 C Ecriture etat initial physique
@@ -1646 +1649 @@
      &              nqtot,dtphys,real(day_ini),0.0,
      &              airefi,albfi,ithfi,zmea,zstd,zsig,zgam,zthe)
-      call physdem1("restartfi.nc",nsoilmx,ngridmx,llm,nq,
+      call physdem1("restartfi.nc",nsoilmx,ngridmx,llm,nqtot,
      &                dtphys,real(day_ini),
      &                tsurf,tsoil,emis,q2,qsurf,

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/start2archive.F

@@ -19 +19 @@
 c=======================================================================
 
-      use infotrac, only: iniadvtrac, nqtot, tname
+      use infotrac, only: infotrac_init, nqtot, tname
       USE comsoil_h
       USE comgeomfi_h, ONLY: lati, long, area
@@ -28 +28 @@
       USE ioipsl_getincom
       USE planete_mod, only: year_day
+      USE control_mod, only: planet_type
       USE callkeys_mod, ONLY: ok_slab_ocean
       use filtreg_mod, only: inifilr
@@ -154 +155 @@
       IF (.not. ALLOCATED(area)) ALLOCATE(area(ngridmx))
 
+      planet_type="generic"
+
 c=======================================================================
 c Lecture des donnees
 c=======================================================================
 ! Load tracer number and names:
-      call iniadvtrac(nqtot,numvanle)
+!      call iniadvtrac(nqtot,numvanle)
+      call infotrac_init
 
 ! allocate arrays:
@@ -168 +172 @@
 
       fichnom = 'start.nc'
-      CALL dynetat0(fichnom,nqtot,vcov,ucov,teta,q,masse,
+      CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
      .       ps,phis,timedyn)
 

trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90

@@ -378 +378 @@
       write(*,*) "phyetat0: Failed loading <",trim(txt),">"
       write(*,*) "         ",trim(txt)," is set to zero"
+      qsurf(:,iq) = 0.
     else
       write(*,*) "phyetat0: Surface tracer <",trim(txt),"> range:", &