Changeset 1536 for trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Timestamp:

Apr 8, 2016, 10:55:28 AM (9 years ago)

Author:

emillour

Message:

Generic GCM:

• Adapted rcm1d.F so that it also runs when compiled from LMDZ.COMMON.

EM

File:

• trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F (modified) (6 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -13 +13 @@
       USE comgeomfi_h, only: lati, long, area
       use phyredem, only: physdem0,physdem1
-      use comgeomphy, only: initcomgeomphy
+      use comgeomphy, only: initcomgeomphy, airephy
       use slab_ice_h, only: noceanmx
       use planete_mod, only: apoastr,periastr,year_day,peri_day,
@@ -140 +140 @@
 c=======================================================================
 ! initialize "serial/parallel" related stuff
-      CALL init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
+!      CALL init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
+      CALL init_phys_lmdz(1,1,llm,1,(/1/))
       call initcomgeomphy
 
@@ -237 +238 @@
 ! OK. now that run.def has been read once -- any variable is in memory.
 ! so we can dump the dummy run.def
-      call system("rm -rf run.def")
+!      call system("rm -rf run.def") ! Ehouarn: delay this to after inifis
 
 ! while we're at it, check if there is a 'traceur.def' file
@@ -330 +331 @@
      !!! AREA. useless in 1D
       area(1)=1.E+0
-      aire(1)=area(1) !JL+EM to have access to the area in the diagfi.nc files. area in comgeomfi.h and aire in comgeom.h
+      airephy(1)=area(1) !JL+EM to have access to the area in the diagfi.nc files. area in comgeomfi.h and aire in comgeom.h
      !!! GEOPOTENTIAL. useless in 1D because control by surface pressure
       phisfi(1)=0.E+0
@@ -516 +517 @@
       CALL inifis(1,llm,nq,day0,daysec,nday,dtphys,
      .            latitude,longitude,area,rad,g,r,cpp)
+
+! At this point, both getin() and getin_p() functions have been used,
+! and the run.def file can be removed.
+      call system("rm -rf run.def")
+
 !!! We check everything is OK.
       PRINT *,"CHECK"
@@ -635 +641 @@
       write(*,*) " v = ",grv
 
+! To be clean, also set vertical winds to zero
+      w(1:nlayer)=0
+
 c     Initialisation des vents  au premier pas de temps
       DO ilayer=1,nlayer