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

Timestamp:

Mar 30, 2016, 8:24:43 AM (9 years ago)

Author:

emillour

Message:

All GCMs:
More on enforcing dynamics/physics separation: get rid of references to "control_mod" from physics packages.
EM

Location:

trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Files:

• kcm1d.F90 (modified) (2 diffs)
• rcm1d.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90

@@ -9 +9 @@
   use planete_mod
   use callkeys_mod, only: check_cpp_match, pceil, tstrat, tracer
-!  use control_mod
+  use inifis_mod, only: inifis
   use comcstfi_mod
   implicit none
@@ -203 +203 @@
   call calc_cpp_mugaz
 
-  call inifis(1,llm,0,86400.0,1.0,0.0,0.0,1.0,rad,g,r,cpp)
+  call inifis(1,llm,0,1,86400.0,1,1.0,&
+              (/0.0/),(/0.0/),(/1.0/),&
+              rad,g,r,cpp)
 
   ! Tracer initialisation

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

@@ -12 +12 @@
       use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat, volcapa
       USE comgeomfi_h, only: lati, long, area
-      use control_mod, only: day_step, ecritphy
       use phyredem, only: physdem0,physdem1
       use comgeomphy, only: initcomgeomphy
@@ -21 +20 @@
       use comcstfi_mod, only: pi, cpp, rad, g, r,
      &                        mugaz, rcp, omeg
-      use time_phylmdz_mod, only: daysec, dtphys
+      use time_phylmdz_mod, only: daysec, dtphys, day_step, ecritphy,
+     &                            nday
       use callkeys_mod, only: tracer,check_cpp_match,rings_shadow,
      &                        specOLR,water,pceil,ok_slab_ocean
@@ -488 +488 @@
       call getin("ndt",ndt)
       write(*,*) " ndt = ",ndt
+      nday=ndt
 
       ndt=ndt*day_step     
@@ -505 +506 @@
 !!! - physical frequency: nevermind, in inifis this is a simple print
       cpp=1.d-7 !JL because we divide by cpp in inifis, there may be a more elegant solution
-      CALL inifis(1,llm,nq,day0,daysec,dtphys,
+      CALL inifis(1,llm,nq,day0,daysec,nday,dtphys,
      .            latitude,longitude,area,rad,g,r,cpp)
 !!! We check everything is OK.