Changeset 1433

Timestamp:

May 28, 2015, 2:50:02 PM (10 years ago)

Author:

aslmd

Message:

commit 1431 removed important initializations. this is corrected. only modifications in moldiff_red were kept from 1431.

Location:

trunk/LMDZ.MARS/libf

Files:

• dynlonlat_phylonlat/phymars/iniphysiq.F90 (modified) (3 diffs)
• dynlonlat_phylonlat/phymars/newstart.F (modified) (2 diffs)
• dynlonlat_phylonlat/phymars/start2archive.F (modified) (2 diffs)
• phymars/dyn1d/testphys1d.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/iniphysiq.F90

@@ -11 +11 @@
                                klon_mpi_begin ! start indes of columns (on local mpi grid)
 
-!use comgeomphy, only : initcomgeomphy, &
-!                       airephy, & ! physics grid area (m2)
-!                       cuphy, & ! cu coeff. (u_covariant = cu * u)
-!                       cvphy, & ! cv coeff. (v_covariant = cv * v)
-!                       rlond, & ! longitudes
-!                       rlatd ! latitudes
+use comgeomphy, only : initcomgeomphy, &
+                       airephy, & ! physics grid area (m2)
+                       cuphy, & ! cu coeff. (u_covariant = cu * u)
+                       cvphy, & ! cv coeff. (v_covariant = cv * v)
+                       rlond, & ! longitudes
+                       rlatd ! latitudes
 use infotrac, only : nqtot ! number of advected tracers
 use comgeomfi_h, only: ini_fillgeom
@@ -116 +116 @@
 
 
-!!$OMP PARALLEL 
-!! Now generate local lon/lat/cu/cv/area arrays
-!call initcomgeomphy
-!
-!!!!!$OMP PARALLEL PRIVATE(ibegin,iend) 
-!!!!$OMP+         SHARED(parea,pcu,pcv,plon,plat)
-! 
-!offset=klon_mpi_begin-1
-!airephy(1:klon_omp)=airefi(offset+klon_omp_begin:offset+klon_omp_end)
-!cuphy(1:klon_omp)=cufi(offset+klon_omp_begin:offset+klon_omp_end)
-!cvphy(1:klon_omp)=cvfi(offset+klon_omp_begin:offset+klon_omp_end)
-!rlond(1:klon_omp)=lonfi(offset+klon_omp_begin:offset+klon_omp_end)
-!rlatd(1:klon_omp)=latfi(offset+klon_omp_begin:offset+klon_omp_end)
+!$OMP PARALLEL 
+! Now generate local lon/lat/cu/cv/area arrays
+call initcomgeomphy
+
+!!!!$OMP PARALLEL PRIVATE(ibegin,iend) 
+!!!$OMP+         SHARED(parea,pcu,pcv,plon,plat)
+      
+offset=klon_mpi_begin-1
+airephy(1:klon_omp)=airefi(offset+klon_omp_begin:offset+klon_omp_end)
+cuphy(1:klon_omp)=cufi(offset+klon_omp_begin:offset+klon_omp_end)
+cvphy(1:klon_omp)=cvfi(offset+klon_omp_begin:offset+klon_omp_end)
+rlond(1:klon_omp)=lonfi(offset+klon_omp_begin:offset+klon_omp_end)
+rlatd(1:klon_omp)=latfi(offset+klon_omp_begin:offset+klon_omp_end)
 
 ! copy some fundamental parameters to physics 
@@ -134 +134 @@
 call phys_state_var_init(klon_omp,nlayer,nqtot, &
                          punjours,ptimestep,prad,pg,pr,pcpp)
-!call ini_fillgeom(klon_omp,rlatd,rlond,airephy)
+call ini_fillgeom(klon_omp,rlatd,rlond,airephy)
 call conf_phys(klon_omp,nlayer,nqtot)
 

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

@@ -29 +29 @@
       use phyredem, only: physdem0, physdem1
       use iostart, only: open_startphy
-!      use comgeomphy, only: initcomgeomphy
+      use comgeomphy, only: initcomgeomphy
 !      use planete_h
       use dimradmars_mod, only: tauscaling
@@ -182 +182 @@
 ! initialize "serial/parallel" related stuff
       CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
-      !call initcomgeomphy
+      call initcomgeomphy
 
 ! Load tracer number and names:

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

@@ -23 +23 @@
       use surfdat_h, only: ini_surfdat_h, qsurf
       use comsoil_h, only: ini_comsoil_h
-!      use comgeomphy, only: initcomgeomphy
+      use comgeomphy, only: initcomgeomphy
       use filtreg_mod, only: inifilr
       use control_mod, only: planet_type
@@ -118 +118 @@
 ! initialize "serial/parallel" related stuff
       CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
-      !call initcomgeomphy
+      call initcomgeomphy
       planet_type='mars'
 

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -13 +13 @@
       use control_mod, only: day_step
       use phyredem, only: physdem0,physdem1
-!      use comgeomphy, only: initcomgeomphy
+      use comgeomphy, only: initcomgeomphy
       use planete_h, only: year_day, periheli, aphelie, peri_day,
      &                     obliquit, emin_turb, lmixmin
@@ -117 +117 @@
 !      CALL init_phys_lmdz(iim,jjp1,llm,1,(/(jjm-1)*iim+2/))
       CALL init_phys_lmdz(iim,jjm+1,llm,1,(/(jjm-1)*iim+2/))
-      !call initcomgeomphy
+      call initcomgeomphy
 
 c ------------------------------------------------------