Changeset 1415 for trunk/LMDZ.MARS/libf

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.MARS/libf

Files:

• dyn3d/defrun_new.F (modified) (2 diffs)
• dynlonlat_phylonlat/phymars/datareadnc.F (modified) (3 diffs)
• dynlonlat_phylonlat/phymars/newstart.F (modified) (6 diffs)
• dynlonlat_phylonlat/phymars/start2archive.F (modified) (5 diffs)

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

@@ -1 +1 @@
       SUBROUTINE defrun_new( tapedef, etatinit )
+#ifndef CPP_PARA
 c
 c-----------------------------------------------------------------------
@@ -576 +577 @@
      &in run.def for this version... -> STOP ! '     
       end if
-
-      RETURN
+#else
+      write(*,*) "defrun_new should not be used in parallel mode!"
+      stop
+#endif
+! of #ifndef CPP_PARA
       END

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/datareadnc.F

@@ -235 +235 @@
      .         iim, jjp1, rlonv, rlatu, zmea,zstd,zsig,zgam,zthe)
 
-          CALL dump2d(iip1,jjp1,zmea,'zmea')
-          CALL dump2d(iip1,jjp1,zstd,'zstd')
-          CALL dump2d(iip1,jjp1,zsig,'zsig')
-          CALL dump2d(iip1,jjp1,zgam,'zgam')
-          CALL dump2d(iip1,jjp1,zthe,'zthe')
-
       endif
 
@@ -274 +268 @@
          z0(1:iimp1*jjp1)=pfield(1:iimp1*jjp1)*.01
          ! multiplied by 0.01 to have z0 in m
-         CALL dump2d(iimp1,jjp1,z0,'z0 in m')
       elseif (k.eq.1) then                    ! albedo
          do i=1,iimp1*jjp1
@@ -300 +293 @@
 
       phisinit(1:iimp1*jjp1)=1000.*phisinit(1:iimp1*jjp1)
-      CALL dump2d(iimp1,jjp1,phisinit,'Altitude in m')
       phisinit(:)=g*phisinit(:)
 

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/newstart.F

@@ -16 +16 @@
 
       use ioipsl_getincom, only: getin 
-      use infotrac, only: iniadvtrac, nqtot, tname
+      use infotrac, only: infotrac_init, nqtot, tname
       use tracer_mod, only: noms, mmol,
      &                      igcm_dust_number, igcm_dust_mass,
@@ -26 +26 @@
      &                     co2ice, emis
       use comsoil_h, only: inertiedat, layer, mlayer, nsoilmx, tsoil
-      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
@@ -179 +179 @@
       preff  = 610.    ! for Mars, instead of 101325. (Earth)
       pa= 20           ! for Mars, instead of 500 (Earth)
+      planet_type="mars"
 
 ! initialize "serial/parallel" related stuff
@@ -185 +186 @@
 
 ! Load tracer number and names:
-      call iniadvtrac(nqtot,numvanle)
+!      call iniadvtrac(nqtot,numvanle)
+      call infotrac_init
 ! allocate arrays
       allocate(q(iip1,jjp1,llm,nqtot))
@@ -1628 +1630 @@
       phis(iip1,:) = phis(1,:)
 
-      CALL inidissip ( lstardis, nitergdiv, nitergrot, niterh,
-     *                tetagdiv, tetagrot , tetatemp  )
+c      CALL inidissip ( lstardis, nitergdiv, nitergrot, niterh,
+c     *                tetagdiv, tetagrot , tetatemp  )
       itau=0
       if (choix_1.eq.0) then
@@ -1644 +1646 @@
 c    $    phi,conser,du,dv,dteta,dp,w, pbaru,pbarv, day_ini )
 
-      CALL dynredem0("restart.nc",day_ini,anneeref,phis,nqtot)
+      CALL dynredem0("restart.nc",day_ini,phis)
       CALL dynredem1("restart.nc",hour_ini,vcov,ucov,teta,q,
-     .               nqtot,masse,ps)
+     .               masse,ps)
 C
 C Ecriture etat initial physique

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/start2archive.F

@@ -19 +19 @@
 c=======================================================================
 
-      use infotrac, only: iniadvtrac, nqtot, tname
+      use infotrac, only: infotrac_init, nqtot, tname
       use comsoil_h, only: nsoilmx, inertiedat
       use surfdat_h, only: ini_surfdat_h, qsurf
@@ -25 +25 @@
       use comgeomphy, only: initcomgeomphy
       use filtreg_mod, only: inifilr
+      use control_mod, only: planet_type
       implicit none
 
@@ -120 +121 @@
       CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
       call initcomgeomphy
+      planet_type='mars'
 
 c=======================================================================
@@ -125 +127 @@
 c=======================================================================
 ! Load tracer number and names:
-      call iniadvtrac(nqtot,numvanle)
+!      call iniadvtrac(nqtot,numvanle)
+      call infotrac_init
 
 ! allocate arrays:
@@ -135 +138 @@
 
       fichnom = 'start.nc'
-      CALL dynetat0(fichnom,nqtot,vcov,ucov,teta,q,masse,
+      CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
      .       ps,phis,timedyn)