Changeset 5081 for LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F
- Timestamp:
- Jul 19, 2024, 4:15:44 PM (4 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/Amaury_dev/libf/dyn3d/leapfrog.F
r4143 r5081 301 301 IF( purmats ) THEN 302 302 ! Purely Matsuno time stepping 303 IF( MOD(itau,iconser) .EQ.0.AND. forward ) conser = .TRUE.304 IF( MOD(itau,dissip_period ) .EQ.0.AND..NOT.forward )303 IF( MOD(itau,iconser) ==0.AND. forward ) conser = .TRUE. 304 IF( MOD(itau,dissip_period )==0.AND..NOT.forward ) 305 305 s apdiss = .TRUE. 306 IF( MOD(itau,iphysiq ) .EQ.0.AND..NOT.forward306 IF( MOD(itau,iphysiq )==0.AND..NOT.forward 307 307 s .and. physic ) apphys = .TRUE. 308 308 ELSE 309 309 ! Leapfrog/Matsuno time stepping 310 IF( MOD(itau ,iconser) .EQ.0 ) conser = .TRUE.311 IF( MOD(itau+1,dissip_period) .EQ.0 .AND. .NOT. forward )310 IF( MOD(itau ,iconser) == 0 ) conser = .TRUE. 311 IF( MOD(itau+1,dissip_period)==0 .AND. .NOT. forward ) 312 312 s apdiss = .TRUE. 313 IF( MOD(itau+1,iphysiq) .EQ.0.AND.physic ) apphys=.TRUE.313 IF( MOD(itau+1,iphysiq)==0.AND.physic ) apphys=.TRUE. 314 314 END IF 315 315 316 316 ! Ehouarn: for Shallow Water case (ie: 1 vertical layer), 317 317 ! supress dissipation step 318 if (llm .eq.1) then318 if (llm==1) then 319 319 apdiss=.false. 320 320 endif … … 387 387 c 388 388 IF( purmats ) THEN 389 IF( itau .EQ.itaufin.AND..NOT.forward ) lafin = .TRUE.389 IF( itau==itaufin.AND..NOT.forward ) lafin = .TRUE. 390 390 ELSE 391 391 IF( itau+1. EQ. itaufin ) lafin = .TRUE. … … 418 418 & (itau+1)/day_step 419 419 420 IF (planet_type .eq."generic") THEN420 IF (planet_type =="generic") THEN 421 421 ! AS: we make jD_cur to be pday 422 422 jD_cur = int(day_ini + itau/day_step) … … 441 441 442 442 c Diagnostique de conservation de l'energie : initialisation 443 IF (ip_ebil_dyn .ge.1 ) THEN443 IF (ip_ebil_dyn>=1 ) THEN 444 444 ztit='bil dyn' 445 445 ! Ehouarn: be careful, diagedyn is Earth-specific! 446 IF (planet_type .eq."earth") THEN446 IF (planet_type=="earth") THEN 447 447 CALL diagedyn(ztit,2,1,1,dtphys 448 448 & , ucov , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2)) … … 488 488 c 489 489 c Diagnostique de conservation de l'energie : difference 490 IF (ip_ebil_dyn .ge.1 ) THEN490 IF (ip_ebil_dyn>=1 ) THEN 491 491 ztit='bil phys' 492 IF (planet_type .eq."earth") THEN492 IF (planet_type=="earth") THEN 493 493 CALL diagedyn(ztit,2,1,1,dtphys 494 494 & , ucov , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2)) … … 498 498 ENDIF ! of IF( apphys ) 499 499 500 IF(iflag_phys .EQ.2) THEN ! "Newtonian" case500 IF(iflag_phys==2) THEN ! "Newtonian" case 501 501 ! Academic case : Simple friction and Newtonan relaxation 502 502 ! ------------------------------------------------------- … … 508 508 ENDDO ! of DO l=1,llm 509 509 510 if (planet_type .eq."giant") then510 if (planet_type=="giant") then 511 511 ! add an intrinsic heat flux at the base of the atmosphere 512 512 teta(:,1)=teta(:,1)+dtvr*aire(:)*ihf/cpp/masse(:,1) … … 663 663 c ------------------------------------- 664 664 665 IF(MOD(itau,iperiod) .EQ.0 .OR. itau.EQ.itaufin) THEN666 IF(itau .EQ.itaufin) THEN665 IF(MOD(itau,iperiod)==0 .OR. itau==itaufin) THEN 666 IF(itau==itaufin) THEN 667 667 iav=1 668 668 ELSE … … 694 694 c ------------------------------ 695 695 696 IF( MOD(itau,iecri) .EQ.0) THEN696 IF( MOD(itau,iecri)==0) THEN 697 697 ! Ehouarn: output only during LF or Backward Matsuno 698 698 if (leapf.or.(.not.leapf.and.(.not.forward))) then … … 721 721 ENDIF ! of IF(MOD(itau,iecri).EQ.0) 722 722 723 IF(itau .EQ.itaufin) THEN723 IF(itau==itaufin) THEN 724 724 725 725 … … 743 743 c ------------------------------------ 744 744 745 IF( MOD(itau,iperiod) .EQ.0 ) THEN745 IF( MOD(itau,iperiod)==0 ) THEN 746 746 GO TO 1 747 747 ELSE IF ( MOD(itau-1,iperiod). EQ. 0 ) THEN
Note: See TracChangeset
for help on using the changeset viewer.