- Timestamp:
- 2020-03-05T12:21:05+01:00 (4 years ago)
- Location:
- NEMO/branches/2020/r12377_ticket2386
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2020/r12377_ticket2386
- Property svn:externals
-
old new 3 3 ^/utils/build/mk@HEAD mk 4 4 ^/utils/tools@HEAD tools 5 ^/vendors/AGRIF/dev _r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD ext/AGRIF5 ^/vendors/AGRIF/dev@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM 7 7 ^/vendors/IOIPSL@HEAD ext/IOIPSL 8 9 # SETTE 10 ^/utils/CI/sette@HEAD sette
-
- Property svn:externals
-
NEMO/branches/2020/r12377_ticket2386/src/OCE/ASM/asminc.F90
r12377 r12511 487 487 ENDIF 488 488 ! 489 IF(lwp) WRITE(numout,*) ' ==>>> Euler time step switch is ', neuler489 IF(lwp) WRITE(numout,*) ' ==>>> Euler time step switch is ', l_1st_euler 490 490 ! 491 491 IF( lk_asminc ) THEN !== data assimilation ==! … … 534 534 ! 535 535 it = kt - nit000 + 1 536 zincwgt = wgtiau(it) / r dt ! IAU weight for the current time step536 zincwgt = wgtiau(it) / rn_Dt ! IAU weight for the current time step 537 537 ! 538 538 IF(lwp) THEN … … 577 577 IF ( kt == nitdin_r ) THEN 578 578 ! 579 neuler = 0! Force Euler forward step579 l_1st_euler = .TRUE. ! Force Euler forward step 580 580 ! 581 581 ! Initialize the now fields with the background + increment … … 651 651 ! 652 652 it = kt - nit000 + 1 653 zincwgt = wgtiau(it) / r dt ! IAU weight for the current time step653 zincwgt = wgtiau(it) / rn_Dt ! IAU weight for the current time step 654 654 ! 655 655 IF(lwp) THEN … … 677 677 IF ( kt == nitdin_r ) THEN 678 678 ! 679 neuler = 0! Force Euler forward step679 l_1st_euler = .TRUE. ! Force Euler forward step 680 680 ! 681 681 ! Initialize the now fields with the background + increment … … 722 722 ! 723 723 it = kt - nit000 + 1 724 zincwgt = wgtiau(it) / r dt ! IAU weight for the current time step724 zincwgt = wgtiau(it) / rn_Dt ! IAU weight for the current time step 725 725 ! 726 726 IF(lwp) THEN … … 753 753 IF ( kt == nitdin_r ) THEN 754 754 ! 755 neuler = 0! Force Euler forward step755 l_1st_euler = .TRUE. ! Force Euler forward step 756 756 ! 757 757 ssh(:,:,Kmm) = ssh_bkg(:,:) + ssh_bkginc(:,:) ! Initialize the now fields the background + increment … … 841 841 it = kt - nit000 + 1 842 842 zincwgt = wgtiau(it) ! IAU weight for the current time step 843 ! note this is not a tendency so should not be divided by r dt (as with the tracer and other increments)843 ! note this is not a tendency so should not be divided by rn_Dt (as with the tracer and other increments) 844 844 ! 845 845 IF(lwp) THEN … … 876 876 #if defined key_cice && defined key_asminc 877 877 ! Sea-ice : CICE case. Pass ice increment tendency into CICE 878 ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / r dt878 ndaice_da(:,:) = seaice_bkginc(:,:) * zincwgt / rn_Dt 879 879 #endif 880 880 ! … … 896 896 IF ( kt == nitdin_r ) THEN 897 897 ! 898 neuler = 0! Force Euler forward step898 l_1st_euler = 0 ! Force Euler forward step 899 899 ! 900 900 ! Sea-ice : SI3 case … … 926 926 #if defined key_cice && defined key_asminc 927 927 ! Sea-ice : CICE case. Pass ice increment tendency into CICE 928 ndaice_da(:,:) = seaice_bkginc(:,:) / r dt928 ndaice_da(:,:) = seaice_bkginc(:,:) / rn_Dt 929 929 #endif 930 930 IF ( .NOT. PRESENT(kindic) ) THEN … … 959 959 ! ! fwf : ice formation and melting 960 960 ! 961 ! zfons = ( -nfresh_da(ji,jj)*soce + nfsalt_da(ji,jj) )*r dt961 ! zfons = ( -nfresh_da(ji,jj)*soce + nfsalt_da(ji,jj) )*rn_Dt 962 962 ! 963 963 ! ! change salinity down to mixed layer depth … … 1000 1000 ! 1001 1001 ! ! ! salt exchanges at the ice/ocean interface 1002 ! ! zpmess = zfons / r dt_ice ! rdt_ice is ice timestep1002 ! ! zpmess = zfons / rDt_ice ! rDt_ice is ice timestep 1003 1003 ! ! 1004 1004 ! !! Adjust fsalt. A +ve fsalt means adding salt to ocean
Note: See TracChangeset
for help on using the changeset viewer.