Changeset 773

Timestamp:

Jun 5, 2007, 2:54:43 PM (17 years ago)

Author:

Laurent Fairhead

Message:

Suite du merge entre la version et la HEAD: quelques modifications de Yann
sur le
LF

Location:

LMDZ4/trunk/libf/dyn3d

Files:

• create_etat0_limit.F (modified) (1 diff)
• etat0_netcdf.F (modified) (1 diff)
• gcm.F (modified) (1 diff)
• grid_noro.F (modified) (5 diffs)
• leapfrog.F (modified) (1 diff)
• mod_const_para.F90 (added)

LMDZ4/trunk/libf/dyn3d/create_etat0_limit.F

@@ -32 +32 @@
       REAL :: pctsrf(iim*(jjm-1)+2, nbsrf)
 
-      
-      call InitDimphy
-      call init_phys_openmp
+      CALL Init_Phys_lmdz(iim,jjp1,llm,nqmx-2,1,(jjm-1)*iim+2)
       call InitComgeomphy
-      
+
       WRITE(6,*) '  *********************  '
       WRITE(6,*) ' interbar = ',interbar

LMDZ4/trunk/libf/dyn3d/etat0_netcdf.F

@@ -464 +464 @@
      $    ,iim, jjp1,
      $    rlonv, rlatu, flic_tmp(1 : iim, 1 : jjp1))
-c$$$      flic_tmp(1 : iim, 1 : jjp1) = champint(1: iim, 1 : jjp1)
+cx$$$      flic_tmp(1 : iim, 1 : jjp1) = champint(1: iim, 1 : jjp1)
       flic_tmp(iip1, 1 : jjp1) = flic_tmp(1 , 1 : jjp1)
 C

LMDZ4/trunk/libf/dyn3d/gcm.F

@@ -196 +196 @@
 #endif
 
-      call InitDimphy
-      call init_phys_openmp
+      CALL Init_Phys_lmdz(iim,jjp1,llm,nqmx-2,1,(jjm-1)*iim+2)
       call InitComgeomphy
 

LMDZ4/trunk/libf/dyn3d/grid_noro.F

@@ -83 +83 @@
       REAL zsig(imar+1,jmar),zgam(imar+1,jmar),zthe(imar+1,jmar)
       REAL zpic(imar+1,jmar),zval(imar+1,jmar)
-c$$$ PB     integer mask(imar+1,jmar)
+cx$$ PB     integer mask(imar+1,jmar)
       real mask(imar+1,jmar), mask_tmp(imar+1,jmar)
       real num_tot(2200,1100),num_lan(2200,1100)
@@ -274 +274 @@
          IF (weight(ii,jj) .NE. 0.0) THEN
 c  Mask
-c$$$           if(num_lan(ii,jj)/num_tot(ii,jj).ge.0.5)then
-c$$$             mask(ii,jj)=1
-c$$$           else
-c$$$             mask(ii,jj)=0
-c$$$           ENDIF
+cx$$           if(num_lan(ii,jj)/num_tot(ii,jj).ge.0.5)then
+cx$$             mask(ii,jj)=1
+cx$$           else
+cx$$             mask(ii,jj)=0
+cx$$           ENDIF
              if (.not. masque_lu) then
                mask(ii,jj) = num_lan(ii,jj)/num_tot(ii,jj)
@@ -319 +319 @@
        CALL MVA9(zxtzy,iim+1,jjm+1) 
        CALL MVA9(zytzy,iim+1,jjm+1)
-C$$$   Masque prenant en compte maximum de terre
-C$$$  On seuil a 10% de terre de terre car en dessous les parametres de surface n'on
-C$$$ pas de sens (PB)
+Cx$$   Masque prenant en compte maximum de terre
+Cx$$  On seuil a 10% de terre de terre car en dessous les parametres de surface n'on
+Cx$$ pas de sens (PB)
        mask_tmp= 0.0
        WHERE(mask .GE. 0.1) mask_tmp = 1.
@@ -339 +339 @@
            if(abs(xm).le.xw) xm=xw*sign(1.,xm)
 c slope: 
-c$$$           zsig(ii,jj)=sqrt(xq)*mask(ii,jj)
-c$$$c isotropy:
-c$$$           zgam(ii,jj)=xp/xq*mask(ii,jj)
-c$$$c angle theta:
-c$$$           zthe(ii,jj)=57.29577951*atan2(xm,xl)/2.*mask(ii,jj)
-c$$$           zphi(ii,jj)=zmea(ii,jj)*mask(ii,jj)
-c$$$           zmea(ii,jj)=zmea(ii,jj)*mask(ii,jj)
-c$$$           zpic(ii,jj)=zpic(ii,jj)*mask(ii,jj)
-c$$$           zval(ii,jj)=zval(ii,jj)*mask(ii,jj)
-c$$$           zstd(ii,jj)=zstd(ii,jj)*mask(ii,jj)
-C$$* PB modif pour maque de terre fractionnaire
+cx$$           zsig(ii,jj)=sqrt(xq)*mask(ii,jj)
+cx$$c isotropy:
+cx$$           zgam(ii,jj)=xp/xq*mask(ii,jj)
+cx$$c angle theta:
+cx$$           zthe(ii,jj)=57.29577951*atan2(xm,xl)/2.*mask(ii,jj)
+cx$$           zphi(ii,jj)=zmea(ii,jj)*mask(ii,jj)
+cx$$           zmea(ii,jj)=zmea(ii,jj)*mask(ii,jj)
+cx$$           zpic(ii,jj)=zpic(ii,jj)*mask(ii,jj)
+cx$$           zval(ii,jj)=zval(ii,jj)*mask(ii,jj)
+cx$$           zstd(ii,jj)=zstd(ii,jj)*mask(ii,jj)
+Cx$* PB modif pour maque de terre fractionnaire
 c slope: 
            zsig(ii,jj)=sqrt(xq)*mask_tmp(ii,jj)
@@ -458 +458 @@
 C MAKE A MOVING AVERAGE OVER 9 GRIDPOINTS OF THE X FIELDS
 
-      PARAMETER (ISMo=300,JSMo=200)
+      PARAMETER (ISMo=400,JSMo=200)
       REAL X(IMAR,JMAR),XF(ISMo,JSMo)
       real WEIGHTpb(-1:1,-1:1)

LMDZ4/trunk/libf/dyn3d/leapfrog.F

@@ -510 +510 @@
 
             IF( itau. EQ. itaufinp1 ) then  
-              write(79,*) 'ucov',ucov
-              write(80,*) 'vcov',vcov
-              write(81,*) 'teta',teta
-              write(82,*) 'ps',ps
-              write(83,*) 'q',q
-              WRITE(85,*) 'q1 = ',q(:,:,1)
-              WRITE(86,*) 'q3 = ',q(:,:,3)
+c              write(79,*) 'ucov',ucov
+c              write(80,*) 'vcov',vcov
+c              write(81,*) 'teta',teta
+c              write(82,*) 'ps',ps
+c              write(83,*) 'q',q
+c              WRITE(85,*) 'q1 = ',q(:,:,1)
+c              WRITE(86,*) 'q3 = ',q(:,:,3)
 
               abort_message = 'Simulation finished'